From b94118db5ed90e77af1811d0a799aa4911d1df6e Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 26 Jun 2015 23:32:45 +0100 Subject: [PATCH] output debug current branch/commit info --- tools/merge-development-with-master.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/merge-development-with-master.sh b/tools/merge-development-with-master.sh index 15d3bcb39b..d590d32074 100755 --- a/tools/merge-development-with-master.sh +++ b/tools/merge-development-with-master.sh @@ -1,11 +1,14 @@ #!/bin/bash set -e +echo "Branch: $TRAVIS_BRANCH" +echo "Commit: $TRAVIS_COMMIT" + if [ "$TRAVIS_BRANCH" != "development" ]; then exit 0; fi git update-ref HEAD master git checkout master -git merge $TRAVIS_COMMIT +git merge "$TRAVIS_COMMIT" git push "https://${GH_TOKEN}@github.com/babel/babel"