Browse Source

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>
maint
Simon Hausmann 18 years ago
parent
commit
330f53b8d6
  1. 3
      contrib/fast-import/git-p4

3
contrib/fast-import/git-p4

@ -1071,7 +1071,8 @@ class P4Sync(Command): @@ -1071,7 +1071,8 @@ class P4Sync(Command):
if p4Change > 0:
self.depotPaths = sorted(self.previousDepotPaths)
self.changeRange = "@%s,#head" % p4Change
self.initialParent = parseRevision(self.branch)
if not self.detectBranches:
self.initialParent = parseRevision(self.branch)
if not self.silent and not self.detectBranches:
print "Performing incremental import into %s git branch" % self.branch


Loading…
Cancel
Save