diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-20 09:54:38 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-02-20 09:59:33 +0100 |
| commit | aaba10f275059cd762c1f07597aa5efb24176cdd (patch) | |
| tree | 3b07e17fcc358b054c95245942769498e8787ac9 | |
| parent | a026a56c4eb558e9c85d90854ad06f8155c45e91 (diff) | |
Revert "Make nicer pull request merge messages"
This reverts commit 1078fb08851442bcd7750c3d5015dc1fe7e4d927 (and thus
pull #5623). It has various issues:
- Pull request names get cut off at ", see e.g. a026a56
- Merge script no longer copes with pulls that have a milestone
attached, due to a duplicate 'title' in JSON that is not handled by the
ad-hoc parsing.
| -rwxr-xr-x | contrib/devtools/github-merge.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh index 7e3dad49d2..ec7a1f4c4b 100755 --- a/contrib/devtools/github-merge.sh +++ b/contrib/devtools/github-merge.sh @@ -82,15 +82,13 @@ 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 $MERGEMESSAGE + echo "Merge pull request #$PULL" 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)" != "d$MERGEMESSAGE" ]; then + if [ "d$(git log --pretty='format:%s' -n 1)" != "dMerge pull request #$PULL" ]; then echo "ERROR: Creating merge failed (already merged?)." >&2 cleanup exit 4 |