diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-12-22 03:19:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 21:19:33 -0500 |
| commit | 2c9dd71140474b1f83f068bece40b25e94240ab4 (patch) | |
| tree | 37072012ede121d648cc50dedea2ec9552f43f75 /services/pull/merge.go | |
| parent | acd5e5a868c2c158132b4017f318943d1e6c573f (diff) | |
| download | gitea-2c9dd71140474b1f83f068bece40b25e94240ab4.tar.gz gitea-2c9dd71140474b1f83f068bece40b25e94240ab4.zip | |
Standardize Co-Authored-By / Reviewed-By strings (#14097)
* Standardize Co-Authored-By / Reviewed-By strings
* Use lowercase variant
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 2c4f939e0a..9d6eadc524 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -353,7 +353,7 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge } else { if committer != sig { // add trailer - message += fmt.Sprintf("\nCo-Authored-By: %s\nCo-Committed-By: %s\n", sig.String(), sig.String()) + message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String()) } if err := git.NewCommand("commit", signArg, fmt.Sprintf("--author='%s <%s>'", sig.Name, sig.Email), "-m", message).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &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()) |