gitea.git - Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea

diff options


context:
space:
mode:

Diffstat (limited to 'services/pull/merge.go')

-rw-r--r--

services/pull/merge.go

1 files changed, 33 insertions, 59 deletions

diff --git a/services/pull/merge.go b/services/pull/merge.go
index 7ffbdb78b0..edd5b601da 100644
--- a/services/pull/merge.go
+++ b/services/pull/merge.go

@@ -370,16 +370,16 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode

sig := doer.NewGitSig()

committer := sig

- // Determine if we should sign

- var signArg git.CmdArg

- sign, keyID, signer, _ := asymkey_service.SignMerge(ctx, pr, doer, tmpBasePath, "HEAD", trackingBranch)

+ // Determine if we should sign. If no signKeyID, use --no-gpg-sign to countermand the sign config (from gitconfig)

+ var signArgs git.TrustedCmdArgs

+ sign, signKeyID, signer, _ := asymkey_service.SignMerge(ctx, pr, doer, tmpBasePath, "HEAD", trackingBranch)

if sign {

- signArg = git.CmdArg("-S" + keyID)

if pr.BaseRepo.GetTrustModel() == repo_model.CommitterTrustModel || pr.BaseRepo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel {

committer = signer

}

+ signArgs = git.ToTrustedCmdArgs([]string{"-S" + signKeyID})

} else {

- signArg = git.CmdArg("--no-gpg-sign")

+ signArgs = append(signArgs, "--no-gpg-sign")

}

commitTimeStr := time.Now().Format(time.RFC3339)

@@ -403,7 +403,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode

return "", err

}

- if err := commitAndSignNoAuthor(ctx, pr, message, signArg, tmpBasePath, env); err != nil {

+ if err := commitAndSignNoAuthor(ctx, pr, message, signArgs, tmpBasePath, env); err != nil {

log.Error("Unable to make final commit: %v", err)

return "", err

}

@@ -505,7 +505,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode

return "", err

}

if mergeStyle == repo_model.MergeStyleRebaseMerge {

- if err := commitAndSignNoAuthor(ctx, pr, message, signArg, tmpBasePath, env); err != nil {

+ if err := commitAndSignNoAuthor(ctx, pr, message, signArgs, tmpBasePath, env); err != nil {

log.Error("Unable to make final commit: %v", err)

return "", err

}

@@ -523,35 +523,22 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode

return "", fmt.Errorf("LoadPoster: %w", err)

}

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).

- Run(&git.RunOpts{

- Env: env,

- Dir: tmpBasePath,

- Stdout: &outbuf,

- Stderr: &errbuf,

- }); err != nil {

- log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

- 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 setting.Repository.PullRequest.AddCoCommitterTrailers && committer.String() != sig.String() {

- // add trailer

- message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String())

- }

- if err := git.NewCommand(ctx, "commit").

- AddArguments(signArg).

- AddArguments(git.CmdArg(fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email))).

- AddArguments("-m").AddDynamicArguments(message).

- Run(&git.RunOpts{

- Env: env,

- Dir: tmpBasePath,

- Stdout: &outbuf,

- Stderr: &errbuf,

- }); err != nil {

- log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

- 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())

- }

+ if setting.Repository.PullRequest.AddCoCommitterTrailers && committer.String() != sig.String() {

+ // add trailer

+ message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String())

+ }

+ if err := git.NewCommand(ctx, "commit").

+ AddArguments(signArgs...).

+ AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email).

+ AddOptionValues("-m", message).

+ Run(&git.RunOpts{

+ Env: env,

+ Dir: tmpBasePath,

+ Stdout: &outbuf,

+ Stderr: &errbuf,

+ }); err != nil {

+ log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

+ 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())

}

outbuf.Reset()

errbuf.Reset()

@@ -649,30 +636,17 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode

return mergeCommitID, nil

}

-func commitAndSignNoAuthor(ctx context.Context, pr *issues_model.PullRequest, message string, signArg git.CmdArg, tmpBasePath string, env []string) error {

+func commitAndSignNoAuthor(ctx context.Context, pr *issues_model.PullRequest, message string, signArgs git.TrustedCmdArgs, tmpBasePath string, env []string) error {

var outbuf, errbuf strings.Builder

- if signArg == "" {

- if err := git.NewCommand(ctx, "commit", "-m").AddDynamicArguments(message).

- Run(&git.RunOpts{

- Env: env,

- Dir: tmpBasePath,

- Stdout: &outbuf,

- Stderr: &errbuf,

- }); err != nil {

- log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

- 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).

- Run(&git.RunOpts{

- Env: env,

- Dir: tmpBasePath,

- Stdout: &outbuf,

- Stderr: &errbuf,

- }); err != nil {

- log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

- 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())

- }

+ if err := git.NewCommand(ctx, "commit").AddArguments(signArgs...).AddOptionValues("-m", message).

+ Run(&git.RunOpts{

+ Env: env,

+ Dir: tmpBasePath,

+ Stdout: &outbuf,

+ Stderr: &errbuf,

+ }); err != nil {

+ log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String())

+ 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())

}

return nil

}