Skip to content
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

Jump to bottom

Repo name added to automatically generated commit message when mergin… #9997

Merged
merged 8 commits into from
Jan 28, 2020
Merged

Repo name added to automatically generated commit message when mergin… #9997

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81f1092
Repo name added to automatically generated commit message when mergin…
shashvat-kedia Jan 26, 2020
05dbfb2
Merge branch 'master' into Fix-9898
lafriks Jan 26, 2020
77e90fa
Merge branch 'master' into Fix-9898
lafriks Jan 26, 2020
82599e5
Merge branch 'master' into Fix-9898
lafriks Jan 26, 2020
76bc521
Merge branch 'master' into Fix-9898
zeripath Jan 27, 2020
a6fcea7
As per @lunny
zeripath Jan 27, 2020
4234db2
Merge remote-tracking branch 'origin/master' into sd1998-Fix-9898
zeripath Jan 27, 2020
771871a
Merge branch 'master' into Fix-9898
zeripath Jan 28, 2020
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
7 changes: 6 additions & 1 deletion models/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,12 @@ func (pr *PullRequest) GetDefaultMergeMessage() string {
log.Error("Cannot load issue %d for PR id %d: Error: %v", pr.IssueID, pr.ID, err)
Copy link
Member

@lunny lunny Jan 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to confirm if the head repository is the same as the base repository. Then return different message. When that is the same repository, we could ignore %s/%s:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lunny take a look I've just pushed some changes up.

return ""
}
return fmt.Sprintf("Merge pull request '%s' (#%d) from %s/%s into %s", pr.Issue.Title, pr.Issue.Index, pr.MustHeadUserName(), pr.HeadBranch, pr.BaseBranch)

if pr.BaseRepoID == pr.HeadRepoID {
return fmt.Sprintf("Merge pull request '%s' (#%d) from %s into %s", pr.Issue.Title, pr.Issue.Index, pr.HeadBranch, pr.BaseBranch)
}

return fmt.Sprintf("Merge pull request '%s' (#%d) from %s:%s into %s", pr.Issue.Title, pr.Issue.Index, pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseBranch)
}

// GetCommitMessages returns the commit messages between head and merge base (if there is one)
Expand Down