Skip to content

Commit

Permalink
Use github's merge message for bors merges
Browse files Browse the repository at this point in the history
Pair programmed with @Vagabond.

Use the same merge-commit message that github uses
for bors auto-merges. We also add a 'Reviewed-by' line
as well. This may not be interesting to upstream, but it
suits our needs.
  • Loading branch information
reiddraper authored and jaredmorrow committed Feb 24, 2014
1 parent 2eed69b commit c763fc3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bors.py
Expand Up @@ -463,9 +463,9 @@ def merge_pull_head_to_test_ref(self):
try:
self.log.info(s)
self.add_comment(self.sha, s)
m = ("auto merge of #%d : %s/%s/%s, r=%s\n\n%s" %
(self.num, self.src_owner, self.src_repo, self.ref,
",".join(self.approval_list()), self.body))
m = ("Merge pull request #%d from %s/%s\n\n%s\n\nReviewed-by: %s" %
(self.num, self.src_owner, self.ref,
self.title, ",".join(self.approval_list())))
j = self.dst().merges().post(base=self.test_ref,
head=self.sha,
commit_message=m)
Expand Down

0 comments on commit c763fc3

Please sign in to comment.