From: Simon Hausmann <shausman@trolltech.com>
Date: Fri, 25 May 2007 09:36:42 +0000 (+0200)
Subject: Shortcut the case where we have no origin branch
X-Git-Tag: v1.5.3-rc0~65^2^2~53
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d414c74afd8610c8c22dadf62b5ba8c6efa59e75;p=git.git

Shortcut the case where we have no origin branch

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index ed5a5c593..d99237c63 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -844,6 +844,7 @@ class P4Sync(Command):
         # map from branch depot path to parent branch
         self.knownBranches = {}
         self.initialParents = {}
+        self.hasOrigin = gitBranchExists("origin")
 
         if self.importIntoRemotes:
             self.refPrefix = "refs/remotes/p4/"
@@ -851,7 +852,7 @@ class P4Sync(Command):
             self.refPrefix = "refs/heads/"
 
         if self.syncWithOrigin:
-            if gitBranchExists("origin"):
+            if self.hasOrigin:
                 if not self.silent:
                     print "Syncing with origin first by calling git fetch origin"
                 system("git fetch origin")
@@ -868,7 +869,8 @@ class P4Sync(Command):
                 createP4HeadRef = True
 
         if len(args) == 0:
-            self.createOrUpdateBranchesFromOrigin()
+            if self.hasOrigin:
+                self.createOrUpdateBranchesFromOrigin()
             self.listExistingP4GitBranches()
 
             if len(self.p4BranchesInGit) > 1: