Use `--message=%s` for git commit message (#23028) (#23029)

Backport #23028

This backport is done by manually because the git module is different.

diff --git a/modules/git/commit.go b/modules/git/commit.go
index 061adc1082355b870f6316cc3410ef71b9afae9b..ec2cc8ad81cc7443a7a78eebd673b5a67456849f 100644 (file)
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -132,7 +132,7 @@ func CommitChangesWithArgs(repoPath string, args []CmdArg, opts CommitChangesOpt
        if opts.Author != nil {
                cmd.AddArguments(CmdArg(fmt.Sprintf("--author='%s <%s>'", opts.Author.Name, opts.Author.Email)))
        }
-       cmd.AddArguments("-m").AddDynamicArguments(opts.Message)
+       cmd.AddArguments(CmdArg("--message=" + opts.Message))
 
        _, _, err := cmd.RunStdString(&RunOpts{Dir: repoPath})
        // No stderr but exit status 1 means nothing to commit.

diff --git a/modules/repository/init.go b/modules/repository/init.go
index 65072a959948e67e979bf85d22e4ee060d281743..c1b97069ffd29af0f82b6a77afd6a1ea7d9c4fa8 100644 (file)
--- a/modules/repository/init.go
+++ b/modules/repository/init.go
@@ -319,7 +319,7 @@ func initRepoCommit(ctx context.Context, tmpPath string, repo *repo_model.Reposi
 
        cmd := git.NewCommand(ctx,
                "commit", git.CmdArg(fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email)),
-               "-m", "Initial commit",
+               "--message=Initial commit",
        )
 
        sign, keyID, signer, _ := asymkey_service.SignInitialCommit(ctx, tmpPath, u)

diff --git a/services/pull/merge.go b/services/pull/merge.go
index 2ae23b344712b937bba19ff3ac78ce94733a8767..3a67919f48b52ebbfb657ca49c40ad80274aaab5 100644 (file)
--- a/services/pull/merge.go
+++ b/services/pull/merge.go
@@ -516,7 +516,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode
                }
                sig := pr.Issue.Poster.NewGitSig()
                if signArg == "" {
-                       if err := git.NewCommand(ctx, "commit", git.CmdArg(fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email)), "-m").AddDynamicArguments(message).
+                       if err := git.NewCommand(ctx, "commit", git.CmdArg(fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email)), git.CmdArg("--message="+message)).
                                Run(&git.RunOpts{
                                        Env:    env,
                                        Dir:    tmpBasePath,
@@ -534,7 +534,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode
                        if err := git.NewCommand(ctx, "commit").
                                AddArguments(signArg).
                                AddArguments(git.CmdArg(fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email))).
-                               AddArguments("-m").AddDynamicArguments(message).
+                               AddArguments(git.CmdArg("--message=" + message)).
                                Run(&git.RunOpts{
                                        Env:    env,
                                        Dir:    tmpBasePath,
@@ -644,7 +644,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode
 func commitAndSignNoAuthor(ctx context.Context, pr *issues_model.PullRequest, message string, signArg git.CmdArg, tmpBasePath string, env []string) error {
        var outbuf, errbuf strings.Builder
        if signArg == "" {
-               if err := git.NewCommand(ctx, "commit", "-m").AddDynamicArguments(message).
+               if err := git.NewCommand(ctx, "commit", git.CmdArg("--message="+message)).
                        Run(&git.RunOpts{
                                Env:    env,
                                Dir:    tmpBasePath,
@@ -655,7 +655,7 @@ func commitAndSignNoAuthor(ctx context.Context, pr *issues_model.PullRequest, me
                        return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())
                }
        } else {
-               if err := git.NewCommand(ctx, "commit").AddArguments(signArg).AddArguments("-m").AddDynamicArguments(message).
+               if err := git.NewCommand(ctx, "commit").AddArguments(signArg).AddArguments(git.CmdArg("--message=" + message)).
                        Run(&git.RunOpts{
                                Env:    env,
                                Dir:    tmpBasePath,