From: Richard W.M. Jones <rjones@redhat.com>
Date: Fri, 7 Jul 2017 10:45:53 +0000 (+0100)
Subject: test-functions: If copying, force checkout of upstream origin/master.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a4794f3aa2af3183e2429f67188d50a477ab7a3a;p=patchq.git

test-functions: If copying, force checkout of upstream origin/

In case our local copy is ahead of origin.
---

diff --git a/test-functions b/test-functions
index 78f7054..771b6bc 100644
--- a/test-functions
+++ b/test-functions
@@ -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