summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-06-09 22:22:30 (GMT)
committerSimon Hausmann <simon@lst.de>2007-06-09 22:22:30 (GMT)
commit7aded26ce870ba2998e276604fc3c18dad6133bd (patch)
tree0a9a4861f8be22a7c7a85badc5025e7abb387c18 /contrib/fast-import
parent5265bfcb06f420841e6304b278b552a4654a4ba0 (diff)
downloadgit-7aded26ce870ba2998e276604fc3c18dad6133bd.zip
git-7aded26ce870ba2998e276604fc3c18dad6133bd.tar.gz
git-7aded26ce870ba2998e276604fc3c18dad6133bd.tar.bz2
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>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 88ea12c..d03ba0b 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/"):]