Browse Source

also strip p4/ from local imports.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
maint
Han-Wen Nienhuys 18 years ago
parent
commit
5265bfcb06
  1. 6
      contrib/fast-import/git-p4

6
contrib/fast-import/git-p4

@ -948,9 +948,9 @@ class P4Sync(Command):
if not line.startswith('p4/') or line == "p4/HEAD": if not line.startswith('p4/') or line == "p4/HEAD":
continue continue
branch = line branch = line
if self.importIntoRemotes:
# strip off p4 # strip off p4
branch = re.sub ("^p4/", "", line) branch = re.sub ("^p4/", "", line)


self.p4BranchesInGit.append(branch) self.p4BranchesInGit.append(branch)
self.initialParents[self.refPrefix + branch] = parseRevision(line) self.initialParents[self.refPrefix + branch] = parseRevision(line)

Loading…
Cancel
Save