undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't attempt to set the initialParent on multi-branch imports (useless).

Browse Source 
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>
This commit is contained in:
Simon Hausmann 2007-06-07 09:39:51 +02:00
parent 583e170706
commit 330f53b8d6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/fast-import/git-p4
View File

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