Fix git symbolic-ref warning on initial clone

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 73da5d2b27bd8455446f47da1386bbf575dd518f..35a513fcb8bab6e7c51d9963138f00e09b58f4b6 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -732,6 +732,8 @@ class P4Sync(Command):
         self.knownBranches = {}
         self.initialParents = {}
 
         self.knownBranches = {}
         self.initialParents = {}
 

+        createP4HeadRef = False;
+

         if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches:
             ### needs to be ported to multi branch import
 
         if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches:
             ### needs to be ported to multi branch import
 


@@ -754,8 +756,9 @@ class P4Sync(Command):
             if gitBranchExists("refs/heads/p4"):
                 system("git update-ref %s refs/heads/p4" % self.branch)
                 system("git branch -D p4");
             if gitBranchExists("refs/heads/p4"):
                 system("git update-ref %s refs/heads/p4" % self.branch)
                 system("git branch -D p4");

+            # create it /after/ importing, when master exists

             if not gitBranchExists("refs/remotes/p4/HEAD"):
             if not gitBranchExists("refs/remotes/p4/HEAD"):

-                system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)
+                createP4HeadRef = True

 
         # this needs to be called after the conversion from heads/p4 to remotes/p4/master
         self.listExistingP4GitBranches()
 
         # this needs to be called after the conversion from heads/p4 to remotes/p4/master
         self.listExistingP4GitBranches()


@@ -1008,6 +1011,9 @@ class P4Sync(Command):
         self.gitOutput.close()
         self.gitError.close()
 
         self.gitOutput.close()
         self.gitError.close()
 

+        if createP4HeadRef:
+            system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)
+

         return True
 
 class P4Rebase(Command):
         return True
 
 class P4Rebase(Command):