From: Simon Hausmann <simon@lst.de>
Date: Sat, 9 Jun 2007 22:22:30 +0000 (+0200)
Subject: Fixed the check to make sure to exclude the HEAD symbolic refs when updating
X-Git-Tag: v1.5.3-rc0~65^2^2~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7aded26ce870ba2998e276604fc3c18dad6133bd;p=git.git

Fixed the check to make sure to exclude the HEAD symbolic refs when updating
the remotes/p4 branches from origin.

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 88ea12cb3..d03ba0b6a 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -962,7 +962,7 @@ class P4Sync(Command):
 
         for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
             line = line.strip()
-            if (not line.startswith("origin/")) or line.endswith("HEAD\n"):
+            if (not line.startswith("origin/")) or line.endswith("HEAD"):
                 continue
 
             headName = line[len("origin/"):]