github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-21 11:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'eb/squash-merge-msg' of _OKE5H2PQKOUfzFFDuD4FA/default/CODE/gitness (#76)

Browse Source
This commit is contained in:
Enver Bisevac 2023-05-17 14:07:21 +00:00 committed by Harness
commit b1898d3bb8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/api/controller/pullreq/merge.go
View File

@ -119,7 +119,12 @@ func (c *Controller) Merge(
}
// TODO: for forking merge title might be different?
mergeTitle := fmt.Sprintf("Merge branch '%s' of %s (#%d)", pr.SourceBranch, sourceRepo.Path, pr.Number)
var mergeTitle string
if in.Method == enum.MergeMethod(gitrpcenum.MergeMethodSquash) {
mergeTitle = fmt.Sprintf("%s (#%d)", pr.Title, pr.Number)
} else {
mergeTitle = fmt.Sprintf("Merge branch '%s' of %s (#%d)", pr.SourceBranch, sourceRepo.Path, pr.Number)
}
var mergeOutput gitrpc.MergeOutput
mergeOutput, err = c.gitRPCClient.Merge(ctx, &gitrpc.MergeParams{