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 ed5a5c593ccd3f85ae3698f5891160765f1f1b4d..d99237c632a68f2592ce3aaa57868a91cf67b2d9 100755 (executable)
--- 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 = {}
         # map from branch depot path to parent branch
         self.knownBranches = {}
         self.initialParents = {}

+        self.hasOrigin = gitBranchExists("origin")

 
         if self.importIntoRemotes:
             self.refPrefix = "refs/remotes/p4/"
 
         if self.importIntoRemotes:
             self.refPrefix = "refs/remotes/p4/"


@@ -851,7 +852,7 @@ class P4Sync(Command):
             self.refPrefix = "refs/heads/"
 
         if self.syncWithOrigin:
             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")
                 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:
                 createP4HeadRef = True
 
         if len(args) == 0:

-            self.createOrUpdateBranchesFromOrigin()
+            if self.hasOrigin:
+                self.createOrUpdateBranchesFromOrigin()

             self.listExistingP4GitBranches()
 
             if len(self.p4BranchesInGit) > 1:
             self.listExistingP4GitBranches()
 
             if len(self.p4BranchesInGit) > 1: