Always pass a sha1 for the initial parent so that git-fast-import doesn't think

it's creating a new branch from itself. It's a sensible error in general but
in the case of incremental imports we have to apply force :)

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 239304857d894e3612d71d90185606955bfa5d22..1f549b5c626325f3ed79d856a673b75d5fda3d21 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -865,7 +865,7 @@ class P4Sync(Command):
         self.previousDepotPath = ""
 
         if len(self.branch) == 0:
         self.previousDepotPath = ""
 
         if len(self.branch) == 0:

-            self.branch = "p4"
+            self.branch = "refs/remotes/p4"

 
         if len(args) == 0:
             if not gitBranchExists(self.branch) and gitBranchExists("origin"):
 
         if len(args) == 0:
             if not gitBranchExists(self.branch) and gitBranchExists("origin"):


@@ -878,11 +878,12 @@ class P4Sync(Command):
                 p4Change = int(p4Change) + 1
                 self.depotPath = self.previousDepotPath
                 self.changeRange = "@%s,#head" % p4Change
                 p4Change = int(p4Change) + 1
                 self.depotPath = self.previousDepotPath
                 self.changeRange = "@%s,#head" % p4Change

-                self.initialParent = self.branch
+                self.initialParent = mypopen("git rev-parse %s" % self.branch).read()[:-1]

                 if not self.silent:
                     print "Performing incremental import into %s git branch" % self.branch
 
                 if not self.silent:
                     print "Performing incremental import into %s git branch" % self.branch
 

-        self.branch = "refs/heads/" + self.branch
+        if not self.branch.startswith("refs/"):
+            self.branch = "refs/heads/" + self.branch

 
         if len(self.depotPath) != 0:
             self.depotPath = self.depotPath[:-1]
 
         if len(self.depotPath) != 0:
             self.depotPath = self.depotPath[:-1]