test-functions: If copying, force checkout of upstream origin/master.
authorRichard W.M. Jones <rjones@redhat.com>
Fri, 7 Jul 2017 10:45:53 +0000 (11:45 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Fri, 7 Jul 2017 10:45:53 +0000 (11:45 +0100)
In case our local copy is ahead of origin.

test-functions

index 78f7054..771b6bc 100644 (file)
@@ -28,7 +28,7 @@ function checkout_sources ()
     if [ -d $HOME/d/$project ]; then
         cp -a $HOME/d/$project .
         pushd $project
-        git checkout -f master
+        git checkout -f origin/master -B master
         git clean -xdf
         git pull
         popd