diff --git a/pkg/cli/admin/release/git.go b/pkg/cli/admin/release/git.go index d6e30f7e26..2ab4ef1be8 100644 --- a/pkg/cli/admin/release/git.go +++ b/pkg/cli/admin/release/git.go @@ -163,7 +163,7 @@ func gitOutputToError(err error, out string) error { } var ( - squashRePR = regexp.MustCompile(`#(\d+)`) + squashRePR = regexp.MustCompile(`[(]#(\d+)[)]`) rePR = regexp.MustCompile(`^Merge pull request #(\d+) from`) rePrefix = regexp.MustCompile(`^(\[[\w\.\-]+\]\s*)+`) ) diff --git a/pkg/cli/admin/release/git_test.go b/pkg/cli/admin/release/git_test.go index 161da76dec..7624f0fe94 100644 --- a/pkg/cli/admin/release/git_test.go +++ b/pkg/cli/admin/release/git_test.go @@ -246,6 +246,17 @@ func Test_mergeLogForRepo(t *testing.T) { }, }, }, + { + input: "abc\x1e1\x1efix vendoring from #123 (#145)\x1e * fix vendoring from #123", + squash: true, + want: []MergeCommit{ + { + ParentCommits: []string{}, Commit: "abc", PullRequest: 145, CommitDate: time.Unix(1, 0).UTC(), + Bugs: BugList{}, + Subject: "fix vendoring from #123 (#145)", + }, + }, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) {