Fixes to setup.sh

* Don't fail if branch name doesn't exist. * Make sure we create the branch at the commit travis is testing.
timvideos · Dec 23, 2016 · 840e634 · 840e634
1 parent 80b871e
commit 840e634
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis/setup.sh b/.travis/setup.sh
@@ -12,8 +12,8 @@ git fetch --unshallow && git fetch --tags
 if [ z"$TRAVIS_BRANCH" != z ]; then
 	echo "Fixing detached head"
 	git branch -v
-	git branch -D $TRAVIS_BRANCH
-	git checkout -b $TRAVIS_BRANCH
+	git branch -D $TRAVIS_BRANCH || true
+	git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
 	git branch -v
 fi
 GIT_REVISION=`git describe`