summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <simon@lst.de>2007-05-28 19:24:57 +0200
committerLibravatar Simon Hausmann <simon@lst.de>2007-05-28 19:24:57 +0200
commitcfeb59be256bf9cd2853ed04d4af056b2f0eff31 (patch)
tree01b68f855ddd61f7aa69b7202768c195c04962f3 /contrib/fast-import
parentIn *_pipe print the command that failed if it fails. (diff)
downloadtgif-cfeb59be256bf9cd2853ed04d4af056b2f0eff31.tar.xz
Fix typo in listExistingP4Branches that broke sync.
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 0f1285b39b..794286ee8e 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -846,8 +846,8 @@ class P4Sync(Command):
cmdline += " --branches"
for line in read_pipe_lines(cmdline):
- lie = line.strip()
- if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"):
+ line = line.strip()
+ if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD"):
continue
if self.importIntoRemotes: