From: Han-Wen Nienhuys Date: Wed, 23 May 2007 21:49:35 +0000 (-0300) Subject: also strip p4/ from local imports. X-Git-Tag: v1.5.3-rc0~65^2^2~19 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5265bfcb06f420841e6304b278b552a4654a4ba0;p=git.git also strip p4/ from local imports. Signed-off-by: Han-Wen Nienhuys --- diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 28e37fa6a..88ea12cb3 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -948,9 +948,9 @@ class P4Sync(Command): if not line.startswith('p4/') or line == "p4/HEAD": continue branch = line - if self.importIntoRemotes: - # strip off p4 - branch = re.sub ("^p4/", "", line) + + # strip off p4 + branch = re.sub ("^p4/", "", line) self.p4BranchesInGit.append(branch) self.initialParents[self.refPrefix + branch] = parseRevision(line)