Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :)
Don't attempt to set the initialParent on multi-branch imports (useless). At some point the code paths should be unified, but for now I need a working git-p4 :) Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Simon Hausmann committed
Jun 7, 2007 at 09:39 UTC
330f53b8d679ece8363a73ed6f6e211d99cd5fdf
1 file changed
+2
-1
contrib/fast-import/git-p4
+2
-1
@@ -1071,7 +1071,8 @@ class P4Sync(Command):
1071
if p4Change > 0:
1072
self.depotPaths = sorted(self.previousDepotPaths)
1073
self.changeRange = "@%s,#head" % p4Change
1074
- self.initialParent = parseRevision(self.branch)
1074
+ if not self.detectBranches:
1075
+ self.initialParent = parseRevision(self.branch)
1076
if not self.silent and not self.detectBranches:
1077
print "Performing incremental import into %s git branch" % self.branch
1078