Skip to content

Reintroduce squash merge default comment as a config setting #16134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 18, 2021
Merged

Reintroduce squash merge default comment as a config setting #16134

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf01131
Reinstate most of commit 09304db9a5d88c035a96f74a4544572bc8c5dac0
parnic May 18, 2021
927bffa
Move the behavior behind a config setting
parnic Jun 10, 2021
ac435d6
Also fix the initial #12365 while we're at it
parnic Jun 10, 2021
6f8f839
Merge remote-tracking branch 'origin/main' into restore-squash-merge-…
parnic Jun 17, 2021
e483a40
Merge branch 'main' into restore-squash-merge-default-comment
6543 Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Reinstate most of commit 09304db
  • Loading branch information
@parnic
parnic committed Jun 10, 2021
commit bf01131c559749486d0db4794fa54d8b28af4a49
25 changes: 19 additions & 6 deletions services/pull/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,22 +564,35 @@ func GetSquashMergeCommitMessages(pr *models.PullRequest) string {
return ""
}

maxSize := setting.Repository.PullRequest.DefaultMergeMessageSize

posterSig := pr.Issue.Poster.NewGitSig().String()

authorsMap := map[string]bool{}
authors := make([]string, 0, list.Len())
stringBuilder := strings.Builder{}

stringBuilder.WriteString(pr.Issue.Content)
if stringBuilder.Len() > 0 {
stringBuilder.WriteRune('\n')
stringBuilder.WriteRune('\n')
}

// commits list is in reverse chronological order
element := list.Back()
for element != nil {
commit := element.Value.(*git.Commit)

if maxSize < 0 || stringBuilder.Len() < maxSize {
toWrite := []byte(commit.CommitMessage)
if len(toWrite) > maxSize-stringBuilder.Len() && maxSize > -1 {
toWrite = append(toWrite[:maxSize-stringBuilder.Len()], "..."...)
}
if _, err := stringBuilder.Write(toWrite); err != nil {
log.Error("Unable to write commit message Error: %v", err)
return ""
}

if _, err := stringBuilder.WriteRune('\n'); err != nil {
log.Error("Unable to write commit message Error: %v", err)
return ""
}
}

authorString := commit.Author.String()
if !authorsMap[authorString] && authorString != posterSig {
authors = append(authors, authorString)
Expand Down