Skip to content

Commit 7f85a48

Browse files
wolfogredelvh
andauthored
Update services/pull/merge.go
Co-authored-by: delvh <[email protected]>
1 parent ea7c444 commit 7f85a48

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

services/pull/merge.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr
130130

131131
func expandDefaultMergeMessage(template string, vars map[string]string) (string, string) {
132132
message := strings.TrimSpace(template)
133-
detail := ""
133+
body := ""
134134
if splits := strings.SplitN(message, "\n", 2); len(splits) == 2 {
135135
message = splits[0]
136-
detail = strings.TrimSpace(splits[1])
136+
body = strings.TrimSpace(splits[1])
137137
}
138138
mapping := func(s string) string { return vars[s] }
139-
return os.Expand(message, mapping), os.Expand(detail, mapping)
139+
return os.Expand(message, mapping), os.Expand(body, mapping)
140140
}
141141

142142
// Merge merges pull request to base repository.

0 commit comments

Comments
 (0)