From: Tim 'mithro' Ansell <mithro@mithis.com>
Date: Sun, 26 Nov 2017 03:44:41 +0000 (-0800)
Subject: travis: Print branches before fetching, try both locations.
X-Git-Tag: yosys-0.8~267^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b24b600287dd64cd170eff53837b34cd17a0cfa5;p=yosys.git

travis: Print branches before fetching, try both locations.
---

diff --git a/.travis/setup.sh b/.travis/setup.sh
index 23bdf563f..81ff37742 100755
--- a/.travis/setup.sh
+++ b/.travis/setup.sh
@@ -29,8 +29,16 @@ fi
 if [ z"$TRAVIS_BRANCH" != z ]; then
 	TRAVIS_COMMIT_ACTUAL=$(git log --pretty=format:'%H' -n 1)
 	echo "- Fixing detached head (current $TRAVIS_COMMIT_ACTUAL -> $TRAVIS_COMMIT)"
-	git fetch origin $TRAVIS_COMMIT
+	git remote -v
 	git branch -v
+	if [ x"$(git show-ref -s HEAD)" = x"$TRAVIS_COMMIT" ]; then
+		echo "Checked out at $TRAVIS_COMMIT"
+	else
+		if [ z"$TRAVIS_PULL_REQUEST_SLUG" != z ]; then
+			git fetch source $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from source"
+		fi
+		git fetch origin $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from origin"
+	fi
 	git branch -D $TRAVIS_BRANCH || true
 	git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
 	git branch -v