Fix creation of refs/remotes/p4/HEAD symbolic ref

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index dbd5b3bcf1e3e6db668b04a8aa6eb327a8fc836a..aeefadcd66a25f88069a659ec4445bff87444453 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -858,8 +858,6 @@ class P4Sync(Command):
                     print "Syncing with origin first by calling git fetch origin"
                 system("git fetch origin")
 
                     print "Syncing with origin first by calling git fetch origin"
                 system("git fetch origin")
 

-        createP4HeadRef = False;
-

         if len(self.branch) == 0:
             self.branch = self.refPrefix + "master"
             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
         if len(self.branch) == 0:
             self.branch = self.refPrefix + "master"
             if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:


@@ -867,7 +865,7 @@ class P4Sync(Command):
                 system("git branch -D p4");
             # create it /after/ importing, when master exists
             if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
                 system("git branch -D p4");
             # create it /after/ importing, when master exists
             if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:

-                createP4HeadRef = True
+                system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))

 
         if len(args) == 0:
             if self.hasOrigin:
 
         if len(args) == 0:
             if self.hasOrigin:


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

-        if createP4HeadRef:
-            system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
-

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