]> git.ipfire.org Git - thirdparty/git.git/commit - t/t6120-describe.sh
describe: prepend "tags/" when describing tags with embedded name
authorDaniel Knittl-Frank <knittl89+git@googlemail.com>
Mon, 11 Dec 2017 17:24:54 +0000 (18:24 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Dec 2017 18:23:11 +0000 (10:23 -0800)
commit1bba00130a1a0332ec0ad2f878a09ca9b2b18ee2
tree93b326475fb56bc80fe4954a10150f53bb4b4f3c
parent3013dff8662eae06457fe6e5348dfe2270810ab2
describe: prepend "tags/" when describing tags with embedded name

The man page of the "git describe" command explains the expected
output when using the --all option, i.e. the full reference path is
shown, including heads/ or tags/ prefix.

When 212945d4a85dfa172ea55ec73b1d830ef2d8582f ("Teach git-describe
to verify annotated tag names before output") made Git favor the
embedded name of annotated tags, it accidentally changed the output
format when the --all flag is given, only printing the tag's name
without the prefix.

Check if --all was specified and re-add the "tags/" prefix for this
special case to fix the regresssion.

Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/describe.c
t/t6120-describe.sh