From 7edc3d087b1d6ad41c363ab16cb12b4b74a375fc Mon Sep 17 00:00:00 2001 From: Enver Bisevac Date: Wed, 17 May 2023 14:17:27 +0200 Subject: [PATCH] sqaush and merge message same as PR title --- internal/api/controller/pullreq/merge.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/api/controller/pullreq/merge.go b/internal/api/controller/pullreq/merge.go index 9f5cdb22c..8a1612a10 100644 --- a/internal/api/controller/pullreq/merge.go +++ b/internal/api/controller/pullreq/merge.go @@ -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{