summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-16 23:05:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-16 23:05:02 (GMT)
commite7b3cea0f7589c57f7bb808330e32bdd7f901c95 (patch)
treef5612fd7df20b7d7273ddf44b30117e6eb1764a9 /sha1_name.c
parentb599672316ae0e0cf827e5e2cd6d3bb403d7b8cd (diff)
parenteb0bcd0fbe34befe7648a398efc7f4156b07da48 (diff)
downloadgit-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.zip
git-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.tar.gz
git-e7b3cea0f7589c57f7bb808330e32bdd7f901c95.tar.bz2
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: dwim_ref: fix dangling symref warning stash pop: remove 'apply' options during 'drop' invocation diff: make sure --output=/bad/path is caught Remove hyphen from "git-command" in two error messages
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 7729925..43884c6 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -280,8 +280,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);