From 7f06bb79c006d989df8fb74f3683fd8438d37cb8 Mon Sep 17 00:00:00 2001 From: Sebastian McKenzie Date: Fri, 26 Jun 2015 23:58:57 +0100 Subject: [PATCH] attempt to fix master fetching for automatic travis merge --- tools/merge-development-with-master.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/merge-development-with-master.sh b/tools/merge-development-with-master.sh index d590d32074..dafc503b66 100755 --- a/tools/merge-development-with-master.sh +++ b/tools/merge-development-with-master.sh @@ -8,7 +8,7 @@ if [ "$TRAVIS_BRANCH" != "development" ]; then exit 0; fi -git update-ref HEAD master +git fetch origin master:master git checkout master git merge "$TRAVIS_COMMIT" git push "https://${GH_TOKEN}@github.com/babel/babel"