From b966f7fc3e8040d433a978300dcaee11ff803134 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 27 Aug 2015 12:03:14 +1000 Subject: [PATCH] autotest: ensure we start on master branch --- Tools/scripts/build_autotest.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tools/scripts/build_autotest.sh b/Tools/scripts/build_autotest.sh index ba51b3b1cf..1b101e0573 100755 --- a/Tools/scripts/build_autotest.sh +++ b/Tools/scripts/build_autotest.sh @@ -88,6 +88,9 @@ report_pull_failure() { oldhash=$(cd APM && git rev-parse HEAD) pushd APM +git checkout -f master +git fetch origin +git reset --hard origin/master git pull || report_pull_failure git clean -f -f -x -d -d git tag autotest-$(date '+%Y-%m-%d-%H%M%S') -m "test tag `date`"