From: Simon Hausmann <simon@lst.de>
Date: Thu, 24 May 2007 20:28:28 +0000 (+0200)
Subject: Oops, fix --with-origin to /really/ also call git fetch :)
X-Git-Tag: v1.5.3-rc0~65^2^2~58
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=10f880f8d4e2c6390928a0bcc8b43161b5f845b2;p=git.git

Oops, fix --with-origin to /really/ also call git fetch :)

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 0597daa84..08af23f9f 100755
--- 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: