From d0cfad03ddbd289536716c865097e0a6cff132ae Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 25 Sep 2015 15:51:22 +0100 Subject: [PATCH] travis.yml: always run `git reset --hard` once. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c35963561..3ac23cb2ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: - env | grep TRAVIS_ - if [ -f ".git/shallow" ]; then travis_retry git fetch --unshallow; fi - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then git reset --hard $TRAVIS_COMMIT || travis_retry git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge:; fi - - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git reset --hard $TRAVIS_COMMIT; fi + - git reset --hard $TRAVIS_COMMIT - git clean -qxdff script: