scripts/bumper: only marshal missing commits

Signed-off-by: Steve Kuznetsov <[email protected]>

Author: stevekuznetsov

scripts/bumper/main.go

@@ -173,16 +173,6 @@ func main() {
 		}
 	}
 
-	if opts.commitFileOutput != "" {
-		commitsJson, err := json.Marshal(commits)
-		if err != nil {
-			logrus.WithError(err).Fatal("could not marshal commits")
-		}
-		if err := os.WriteFile(opts.commitFileOutput, commitsJson, 0666); err != nil {
-			logrus.WithError(err).Fatal("could not write commits")
-		}
-	}
-
 	var missingCommits []commit
 	for _, commit := range commits {
 		commitLogger := logger.WithField("commit", commit.Hash)
@@ -195,6 +185,16 @@ func main() {
 		}
 	}
 
+	if opts.commitFileOutput != "" {
+		commitsJson, err := json.Marshal(missingCommits)
+		if err != nil {
+			logrus.WithError(err).Fatal("could not marshal commits")
+		}
+		if err := os.WriteFile(opts.commitFileOutput, commitsJson, 0666); err != nil {
+			logrus.WithError(err).Fatal("could not write commits")
+		}
+	}
+
 	cherryPickAll := func() {
 		if err := setCommitter(ctx, logger.WithField("phase", "setup"), opts.gitName, opts.gitEmail); err != nil {
 			logger.WithError(err).Fatal("failed to set committer")