From a10431e7a433e1cd33fe5547d7b5e73526925276 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 5 Apr 2016 00:27:57 +0200
Subject: [PATCH] travis-apidoc: reference PR only in merge commit for less
 noise in the PR

---
 build-utils/travis-apidoc.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-utils/travis-apidoc.sh b/build-utils/travis-apidoc.sh
index 80cd7836d..67c5c0bb2 100755
--- a/build-utils/travis-apidoc.sh
+++ b/build-utils/travis-apidoc.sh
@@ -72,10 +72,6 @@ Last commit message:
 $(cd $REPO_DIR && git log -1 --pretty=format:%s)
 
 Build URL: https://travis-ci.org/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}"
-if [ "$TRAVIS_PULL_REQUEST" != false ]; then
-    COMMIT_MSG="$COMMIT_MSG
-Pull request: https://github.com/awesomeWM/awesome/pull/${TRAVIS_PULL_REQUEST}"
-fi
 git commit -m "[relevant] $COMMIT_MSG"
 
 # Commit the irrelevant changes.
@@ -94,7 +90,12 @@ git tag -d _old
 
 git checkout "$BRANCH"
 OLD_REV="$(git rev-parse --short HEAD)"
-git merge --no-ff -m "$COMMIT_MSG" merged-update
+MERGE_COMMIT_MSG="$COMMIT_MSG"
+if [ "$TRAVIS_PULL_REQUEST" != false ]; then
+    COMMIT_MSG="$COMMIT_MSG
+Pull request: https://github.com/awesomeWM/awesome/pull/${TRAVIS_PULL_REQUEST}"
+fi
+git merge --no-ff -m "$MERGE_COMMIT_MSG" merged-update
 NEW_REV="$(git rev-parse --short HEAD)"
 
 git push --quiet origin "$BRANCH"