diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2007-05-23 18:49:35 -0300 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@google.com> | 2007-06-08 19:31:49 -0300 |
| commit | 5265bfcb06f420841e6304b278b552a4654a4ba0 (patch) | |
| tree | 372cf05d106dc5985abcf03423f15cc8136c62b9 /contrib/fast-import | |
| parent | Merge branch 'master' of git://repo.or.cz/fast-export (diff) | |
| download | tgif-5265bfcb06f420841e6304b278b552a4654a4ba0.tar.xz | |
also strip p4/ from local imports.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 28e37fa6ab..88ea12cb37 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) |