diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 23:18:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 23:18:10 (GMT) |
| commit | 468dc22e0085db29994b4296ca0127f27a686fa0 (patch) | |
| tree | bbc3dde066a79001dd1524745559f88e09a17995 /builtin | |
| parent | af38deeb472ae1921b7d367c4b406722b2dd9eef (diff) | |
| parent | 1bba00130a1a0332ec0ad2f878a09ca9b2b18ee2 (diff) | |
| download | git-468dc22e0085db29994b4296ca0127f27a686fa0.zip git-468dc22e0085db29994b4296ca0127f27a686fa0.tar.gz git-468dc22e0085db29994b4296ca0127f27a686fa0.tar.bz2 | |
Merge branch 'dk/describe-all-output-fix' into maint
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')
| -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 3b0b204..6fe1c51 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) |