Browse Source

Merge #5623: Make nicer pull request merge messages

1078fb0 Make nicer pull request merge messages (BtcDrak)
0.13
Wladimir J. van der Laan 10 years ago
parent
commit
f69941620b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 6
      contrib/devtools/github-merge.sh

6
contrib/devtools/github-merge.sh

@ -82,13 +82,15 @@ function cleanup() { @@ -82,13 +82,15 @@ function cleanup() {
}
# Create unsigned merge commit.
PRTITLE=`curl -s https://api.github.com/repos/$REPO/pulls/$PULL | grep -e ' "title": ".*",'| awk -F'"' '{print $4}'`
MERGEMESSAGE="Merge #$PULL: $PRTITLE"
(
echo "Merge pull request #$PULL"
echo $MERGEMESSAGE
echo ""
git log --no-merges --topo-order --pretty='format:%h %s (%an)' pull/"$PULL"/base..pull/"$PULL"/head
)>"$TMPDIR/message"
if git merge -q --commit --no-edit --no-ff -m "$(<"$TMPDIR/message")" pull/"$PULL"/head; then
if [ "d$(git log --pretty='format:%s' -n 1)" != "dMerge pull request #$PULL" ]; then
if [ "d$(git log --pretty='format:%s' -n 1)" != "d$MERGEMESSAGE" ]; then
echo "ERROR: Creating merge failed (already merged?)." >&2
cleanup
exit 4

Loading…
Cancel
Save