Merge branch 'sp/maint-describe-all-tag-warning' into maint

gitster · gitster · commit fcd3549ef239 · 2008-12-27T14:21:15.000-08:00
* sp/maint-describe-all-tag-warning:
  describe: Avoid unnecessary warning when using --all
diff --git a/builtin-describe.c b/builtin-describe.c
@@ -158,7 +158,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
`@@ -158,7 +158,7 @@ static void display_name(struct commit_name *n)`
`158`	`158`	`n->tag = lookup_tag(n->sha1);`
`159`	`159`	`if (!n->tag \|\| parse_tag(n->tag) \|\| !n->tag->tag)`
`160`	`160`	`die("annotated tag %s not available", n->path);`
`161`		`- if (strcmp(n->tag->tag, n->path))`
	`161`	`+ if (strcmp(n->tag->tag, all ? n->path + 5 : n->path))`
`162`	`162`	`warning("tag '%s' is really '%s' here", n->tag->tag, n->path);`
`163`	`163`	`}`
`164`	`164`