From 03fa2eccbc6dcdaa08497201113af5f6c2ff6e6b Mon Sep 17 00:00:00 2001 From: Jimmy Praet Date: Wed, 25 Nov 2020 21:08:17 +0100 Subject: [PATCH] Use chronological commit order in default squash message (#13661) (#13696) --- services/pull/pull.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/pull/pull.go b/services/pull/pull.go index 61af7fe9a..0bfcd8a63 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -556,7 +556,8 @@ func GetCommitMessages(pr *models.PullRequest) string { authorsMap := map[string]bool{} authors := make([]string, 0, list.Len()) stringBuilder := strings.Builder{} - element := list.Front() + // commits list is in reverse chronological order + element := list.Back() for element != nil { commit := element.Value.(*git.Commit) @@ -581,7 +582,7 @@ func GetCommitMessages(pr *models.PullRequest) string { authors = append(authors, authorString) authorsMap[authorString] = true } - element = element.Next() + element = element.Prev() } // Consider collecting the remaining authors