summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@google.com>2007-05-23 21:49:35 (GMT)
committerHan-Wen Nienhuys <hanwen@google.com>2007-06-08 22:31:49 (GMT)
commit5265bfcb06f420841e6304b278b552a4654a4ba0 (patch)
tree372cf05d106dc5985abcf03423f15cc8136c62b9 /contrib
parent69d8cc8b991564daf7b0c71ea50c492bcc0aedeb (diff)
downloadgit-5265bfcb06f420841e6304b278b552a4654a4ba0.zip
git-5265bfcb06f420841e6304b278b552a4654a4ba0.tar.gz
git-5265bfcb06f420841e6304b278b552a4654a4ba0.tar.bz2
also strip p4/ from local imports.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p46
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 28e37fa..88ea12c 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)