summaryrefslogtreecommitdiff
path: root/builtin-describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-27 14:21:15 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-27 14:21:15 -0800
commitfcd3549ef239378d1d2ca11df9e8c91f7fa0ab2e (patch)
tree1ba8c1b2ae71e4ba500479c7471a198db3fcabaa /builtin-describe.c
parentf83b9ba20973472f64699e1e2707b74da211a89b (diff)
parent81dc223deba84341be9681d7a1a4a183e02e41d6 (diff)
downloadgit-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
Diffstat (limited to 'builtin-describe.c')
-rw-r--r--builtin-describe.c2
1 files changed, 1 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);
}