From 1bfb44c62d15a45ca4d47b4cc482ebddb8d0ae4f Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Tue, 6 Jan 2015 17:55:42 +0100 Subject: Fixed up travis to checkout master now --- .travis.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14af1909..004129e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,18 +14,12 @@ install: - git fetch --tags - pip install coveralls - # generate some reflog as git-python tests need it (in 0.3) - - git checkout 0.3 + # generate some reflog as git-python tests need it (in master) + - git checkout master - git reset --hard HEAD~1 - git reset --hard HEAD~1 - git reset --hard HEAD~1 - - git reset --hard origin/0.3 - - git checkout -b master - - git reset --hard HEAD~1 - - git reset --hard HEAD~1 - - git reset --hard HEAD~1 - - git reset --hard origin/0.3 - - git checkout 0.3 + - git reset --hard origin/master # as commits are performed with the default user, it needs to be set for travis too - git config --global user.email "travis@ci.com" -- cgit v1.2.1