diff options
| author | Simon Hausmann <simon@lst.de> | 2007-06-10 00:22:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-06-10 00:22:30 +0200 |
| commit | 7aded26ce870ba2998e276604fc3c18dad6133bd (patch) | |
| tree | 0a9a4861f8be22a7c7a85badc5025e7abb387c18 | |
| parent | 5265bfcb06f420841e6304b278b552a4654a4ba0 (diff) | |
| download | git-7aded26ce870ba2998e276604fc3c18dad6133bd.tar.gz git-7aded26ce870ba2998e276604fc3c18dad6133bd.tar.xz | |
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>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
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/"):] |