Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Oops, fix --with-origin to /really/ also call git fetch :)
[gitweb.git]
/
contrib
/
fast-import
/
git-p4
diff --git
a/contrib/fast-import/git-p4
b/contrib/fast-import/git-p4
index 0597daa8491f3c4604448fded7f75bf7db95d203..08af23f9fd23e113c13b55ce2cd62803c27b89ae 100755
(executable)
--- a/
contrib/fast-import/git-p4
+++ b/
contrib/fast-import/git-p4
@@
-841,6
+841,10
@@
class P4Sync(Command):
else:
self.refPrefix = "refs/heads/"
+ if self.syncWithOrigin:
+ print "Syncing with origin first as requested by calling git fetch origin"
+ system("git fetch origin")
+
createP4HeadRef = False;
if len(self.branch) == 0: