From: Simon Hausmann <simon@lst.de>
Date: Mon, 28 May 2007 17:24:57 +0000 (+0200)
Subject: Fix typo in listExistingP4Branches that broke sync.
X-Git-Tag: v1.5.3-rc0~65^2^2~35^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cfeb59be256bf9cd2853ed04d4af056b2f0eff31;p=git.git

Fix typo in listExistingP4Branches that broke sync.

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 0f1285b39..794286ee8 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: