describe: Avoid unnecessary warning when using --all
In 212945d4 ("Teach git-describe to verify annotated tag names before output") git-describe learned how to output a warning if an annotated tag object was matched but its internal name doesn't match the local ref name. However, "git describe --all" causes the local ref name to be prefixed with "tags/", so we need to skip over this prefix before comparing the local ref name with the name recorded inside of the tag object. Patch-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Shawn O. Pearce committed
Dec 26, 2008 at 14:02 UTC
81dc223deba84341be9681d7a1a4a183e02e41d6
2 files changed
+7
-1
builtin-describe.c
+1
-1
@@ -160,7 +160,7 @@ static void display_name(struct commit_name *n)
160
n->tag = lookup_tag(n->sha1);
161
if (!n->tag || parse_tag(n->tag) || !n->tag->tag)
162
die("annotated tag %s not available", n->path);
163
- if (strcmp(n->tag->tag, n->path))
163
+ if (strcmp(n->tag->tag, all ? n->path + 5 : n->path))
164
warning("tag '%s' is really '%s' here", n->tag->tag, n->path);
165
}
166
t/t6120-describe.sh
+6
@@ -100,6 +100,12 @@ check_describe B --tags HEAD^^2^
100
check_describe B-0-* --long HEAD^^2^
101
check_describe A-3-* --long HEAD^^2
102
103
+: >err.expect
104
+check_describe A --all A^0
105
+test_expect_success 'no warning was displayed for A' '
106
+ test_cmp err.expect err.actual
107
+'
108
+
109
test_expect_success 'rename tag A to Q locally' '
110
mv .git/refs/tags/A .git/refs/tags/Q
111
'