From ff8e257839de908a144ed83fcc705dfe61379962 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Mon, 18 Feb 2019 12:59:36 -0500 Subject: [PATCH] travis: fix bitcoind update --- test/setup_environment.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/setup_environment.sh b/test/setup_environment.sh index 7c7436f..f32eeaf 100755 --- a/test/setup_environment.sh +++ b/test/setup_environment.sh @@ -164,8 +164,8 @@ else if [ $LOCAL = $REMOTE ]; then echo "Up-to-date" - else - git reset --hard origin/hww + elif [ $LOCAL = $BASE ]; then + git pull bitcoind_setup_needed=true fi fi