diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-27 14:21:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-27 14:21:15 -0800 |
| commit | fcd3549ef239378d1d2ca11df9e8c91f7fa0ab2e (patch) | |
| tree | 1ba8c1b2ae71e4ba500479c7471a198db3fcabaa | |
| parent | f83b9ba20973472f64699e1e2707b74da211a89b (diff) | |
| parent | 81dc223deba84341be9681d7a1a4a183e02e41d6 (diff) | |
| download | git-fcd3549ef239378d1d2ca11df9e8c91f7fa0ab2e.tar.gz | |
Merge branch 'sp/maint-describe-all-tag-warning' into maint
* sp/maint-describe-all-tag-warning:
describe: Avoid unnecessary warning when using --all
| -rw-r--r-- | builtin-describe.c | 2 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index d2cfb1b083..3a007ed1ca 100644 --- 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 index e6c9e59b61..8c7e081c53 100755 --- 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 ' |