diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-06-07 09:39:51 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-06-07 09:39:51 +0200 |
| commit | 330f53b8d679ece8363a73ed6f6e211d99cd5fdf (patch) | |
| tree | bc00fbe1ae9ddf384e2f2e15f1f2bc36c62ace28 /contrib/fast-import/git-p4 | |
| parent | Fix common path "calculation" from logs of multiple branches. (diff) | |
| download | tgif-330f53b8d679ece8363a73ed6f6e211d99cd5fdf.tar.xz | |
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>
Diffstat (limited to 'contrib/fast-import/git-p4')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index ba34f0a61f..ff737d762c 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -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 |