diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-16 15:04:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-16 15:04:55 -0800 |
| commit | eb0bcd0fbe34befe7648a398efc7f4156b07da48 (patch) | |
| tree | 997b4970db45623e0267704c81a130202cb86c0e /sha1_name.c | |
| parent | 7283bbc70a55d7364fbeaefc1009c03fcfc8d929 (diff) | |
| parent | 003c6abdb27c367747847a76b0a7890d67c794be (diff) | |
| download | git-eb0bcd0fbe34befe7648a398efc7f4156b07da48.tar.gz git-eb0bcd0fbe34befe7648a398efc7f4156b07da48.tar.xz | |
Merge branch 'maint-1.6.5' into maint-1.6.6
* maint-1.6.5:
dwim_ref: fix dangling symref warning
stash pop: remove 'apply' options during 'drop' invocation
diff: make sure --output=/bad/path is caught
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c index 04fb3b8fe..7013c53ca 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -278,8 +278,7 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) *ref = xstrdup(r); if (!warn_ambiguous_refs) break; - } else if ((flag & REF_ISSYMREF) && - (len != 4 || strcmp(str, "HEAD"))) + } else if ((flag & REF_ISSYMREF) && strcmp(fullref, "HEAD")) warning("ignoring dangling symref %s.", fullref); } free(last_branch); |