diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-27 14:25:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-27 14:25:14 -0800 |
| commit | 159c88e5ae95c5b02298193c1658fac5919c8012 (patch) | |
| tree | 766bead8dd95169b455c4b3fdc6afaa73e40637b /builtin-describe.c | |
| parent | Start 1.6.2 cycle (diff) | |
| parent | Merge branch 'rs/maint-tformat-foldline' into maint (diff) | |
| download | tgif-159c88e5ae95c5b02298193c1658fac5919c8012.tar.xz | |
Merge branch 'maint'
* maint:
git-send-email.txt: move --format-patch paragraph to a proper location
git-shortlog.txt: improve documentation about .mailmap files
pretty: support multiline subjects with format:
pretty: factor out format_subject()
pretty: factor out skip_empty_lines()
merge-file: handle freopen() failure
daemon: cleanup: factor out xstrdup_tolower()
daemon: cleanup: replace loop with if
daemon: handle freopen() failure
describe: Avoid unnecessary warning when using --all
Diffstat (limited to 'builtin-describe.c')
| -rw-r--r-- | builtin-describe.c | 2 |
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); } |