diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:28 -0800 |
| commit | fac64e011f1b1ecabcccf7ad2511efcac3e26bdc (patch) | |
| tree | c42dd7ee0406e30714e52ac6381327c5b62d2432 /builtin/describe.c | |
| parent | Sync with v2.16.1 (diff) | |
| parent | describe: prepend "tags/" when describing tags with embedded name (diff) | |
| download | tgif-fac64e011f1b1ecabcccf7ad2511efcac3e26bdc.tar.xz | |
Merge branch 'dk/describe-all-output-fix'
An old regression in "git describe --all $annotated_tag^0" has been
fixed.
* dk/describe-all-output-fix:
describe: prepend "tags/" when describing tags with embedded name
Diffstat (limited to 'builtin/describe.c')
| -rw-r--r-- | builtin/describe.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 3b0b204b1e..6fe1c51281 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -274,10 +274,13 @@ static void append_name(struct commit_name *n, struct strbuf *dst) n->name_checked = 1; } - if (n->tag) + if (n->tag) { + if (all) + strbuf_addstr(dst, "tags/"); strbuf_addstr(dst, n->tag->tag); - else + } else { strbuf_addstr(dst, n->path); + } } static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst) |