Make --with-origin also work without origin :)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
git-mirror · May 25, 2007 · 417a7a6 · 417a7a6
1 parent 4280e53
commit 417a7a6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
@@ -846,8 +846,9 @@ class P4Sync(Command):
             self.refPrefix = "refs/heads/"
 
         if self.syncWithOrigin:
-            print "Syncing with origin first as requested by calling git fetch origin"
-            system("git fetch origin")
+            if gitBranchExists("origin"):
+                print "Syncing with origin first as requested by calling git fetch origin"
+                system("git fetch origin")
 
         createP4HeadRef = False;