describe: Avoid unnecessary warning when using --all

spearce · gitster · commit 81dc223deba8 · 2008-12-26T16:37:53.000-08:00
In 212945d ("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>
diff --git a/builtin-describe.c b/builtin-describe.c
@@ -160,7 +160,7 @@ static void display_name(struct commit_name *n)
 		n->tag = lookup_tag(n->sha1);
 		if (!n->tag || parse_tag(n->tag) || !n->tag->tag)
 			die("annotated tag %s not available", n->path);
-		if (strcmp(n->tag->tag, n->path))
+		if (strcmp(n->tag->tag, all ? n->path + 5 : n->path))
 			warning("tag '%s' is really '%s' here", n->tag->tag, n->path);
 	}
 
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
@@ -100,6 +100,12 @@ check_describe B --tags HEAD^^2^
 check_describe B-0-* --long HEAD^^2^
 check_describe A-3-* --long HEAD^^2
 
+: >err.expect
+check_describe A --all A^0
+test_expect_success 'no warning was displayed for A' '
+	test_cmp err.expect err.actual
+'
+
 test_expect_success 'rename tag A to Q locally' '
 	mv .git/refs/tags/A .git/refs/tags/Q
 '

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ static void display_name(struct commit_name *n)`
`160`	`160`	`n->tag = lookup_tag(n->sha1);`
`161`	`161`	`if (!n->tag \|\| parse_tag(n->tag) \|\| !n->tag->tag)`
`162`	`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`	`164`	`warning("tag '%s' is really '%s' here", n->tag->tag, n->path);`
`165`	`165`	`}`
`166`	`166`