From b70a0f6b81a6de436fc1e4e48d39c0a2310166ed Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 31 Mar 2026 14:43:37 -0400 Subject: [PATCH] Remove setting the expectedMergeBase in commitchecker The field is optional. The commitchecker ought to be able to figure this out. Signed-off-by: Todd Short --- pkg/v1/cmd.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkg/v1/cmd.go b/pkg/v1/cmd.go index b7bbc1a..1c2b9ad 100644 --- a/pkg/v1/cmd.go +++ b/pkg/v1/cmd.go @@ -922,7 +922,7 @@ func applyConfig(ctx context.Context, logger *logrus.Entry, org, repo, branch, d } } - return writeCommitCheckerFile(ctx, logger, org, repo, branch, config.Target.Hash, dir, commitArgs) + return writeCommitCheckerFile(ctx, logger, org, repo, branch, dir, commitArgs) } func rewriteGoMod(ctx context.Context, logger *logrus.Entry, dir string, commits map[string]string, commitArgs []string) error { @@ -968,7 +968,7 @@ func rewriteGoMod(ctx context.Context, logger *logrus.Entry, dir string, commits return nil } -func writeCommitCheckerFile(ctx context.Context, logger *logrus.Entry, org, repo, branch, expectedMergeBase, dir string, commitArgs []string) error { +func writeCommitCheckerFile(ctx context.Context, logger *logrus.Entry, org, repo, branch, dir string, commitArgs []string) error { // TODO: move the upstream commit-checker code out of `main` package so we can import this and the regex var config = struct { // UpstreamOrg is the organization of the upstream repository @@ -977,13 +977,10 @@ func writeCommitCheckerFile(ctx context.Context, logger *logrus.Entry, org, repo UpstreamRepo string `json:"upstreamRepo,omitempty"` // UpstreamBranch is the branch from the upstream repository we're tracking UpstreamBranch string `json:"upstreamBranch,omitempty"` - // ExpectedMergeBase is the latest commit from the upstream that is expected to be present in this downstream - ExpectedMergeBase string `json:"expectedMergeBase,omitempty"` }{ - UpstreamOrg: org, - UpstreamRepo: repo, - UpstreamBranch: branch, - ExpectedMergeBase: expectedMergeBase, + UpstreamOrg: org, + UpstreamRepo: repo, + UpstreamBranch: branch, } raw, err := yaml.Marshal(&config)