Skip to content

Commit 3e7bd95

Browse files
hiifongwxiaoguang
authored andcommitted
Fix duplicate co-author in squashed merge commit messages (go-gitea#33020)
Fix: go-gitea#31980 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
1 parent 27de603 commit 3e7bd95

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

services/pull/merge_squash.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package pull
55

66
import (
77
"fmt"
8+
"strings"
89

910
repo_model "code.gitea.io/gitea/models/repo"
1011
user_model "code.gitea.io/gitea/models/user"
@@ -66,7 +67,10 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error {
6667

6768
if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() {
6869
// add trailer
69-
message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String())
70+
if !strings.Contains(message, fmt.Sprintf("Co-authored-by: %s", sig.String())) {
71+
message += fmt.Sprintf("\nCo-authored-by: %s", sig.String())
72+
}
73+
message += fmt.Sprintf("\nCo-committed-by: %s\n", sig.String())
7074
}
7175
cmdCommit := git.NewCommand(ctx, "commit").
7276
AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email).

0 commit comments

Comments
 (0)