X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=sha1_name.c;h=2f75179f4c6c1d05bdd7594b23dcf77007c26751;hb=535bb89320ba949f0d64eda530ba5dec0ec6f188;hp=5d0ac0263d04d7ec72a3b7dec4aaf47aec80da5e;hpb=fa5bc8abb35e34f673c41cb5c66d0a2f21536861;p=git.git diff --git a/sha1_name.c b/sha1_name.c index 5d0ac0263..2f75179f4 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -268,16 +268,19 @@ int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) char fullref[PATH_MAX]; unsigned char sha1_from_ref[20]; unsigned char *this_result; + int flag; this_result = refs_found ? sha1_from_ref : sha1; mksnpath(fullref, sizeof(fullref), *p, len, str); - r = resolve_ref(fullref, this_result, 1, NULL); + r = resolve_ref(fullref, this_result, 1, &flag); if (r) { if (!refs_found++) *ref = xstrdup(r); if (!warn_ambiguous_refs) break; - } + } else if ((flag & REF_ISSYMREF) && + (len != 4 || strcmp(str, "HEAD"))) + warning("ignoring dangling symref %s.", fullref); } free(last_branch); return refs_found;