From: Simon Hausmann <shausman@rhea.troll.no>
Date: Fri, 25 May 2007 08:28:46 +0000 (+0200)
Subject: Make --with-origin also work without origin :)
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=c083b834af9a4d3c89f1b72dc638684d7ae4a62a;p=python%2Ffast-export.git

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

diff --git a/git-p4 b/git-p4
index e8a5c1f..30ee68c 100755
--- a/git-p4
+++ b/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;