git.annexia.org
/
patchq.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ed4d31
)
test-functions: If copying, force checkout of upstream origin/master.
author
Richard W.M. Jones
<rjones@redhat.com>
Fri, 7 Jul 2017 10:45:53 +0000
(11:45 +0100)
committer
Richard 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
patch
|
blob
|
history
diff --git
a/test-functions
b/test-functions
index
78f7054
..
771b6bc
100644
(file)
--- 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