diff options
| author |  Daniel Knittl-Frank <knittl89+git@googlemail.com> | 2017-12-11 18:24:54 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-27 10:23:11 -0800 |
| commit | 1bba00130a1a0332ec0ad2f878a09ca9b2b18ee2 (patch) | |
| tree | 93b326475fb56bc80fe4954a10150f53bb4b4f3c /t/t6120-describe.sh | |
| parent | Prepare for 2.15.2 (diff) | |
| download | tgif-1bba00130a1a0332ec0ad2f878a09ca9b2b18ee2.tar.xz | |
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>
Diffstat (limited to 't/t6120-describe.sh')
| -rwxr-xr-x | t/t6120-describe.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 1c0e8659d9..15612b3bbe 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -122,7 +122,7 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' ' ' : >err.expect -check_describe A --all A^0 +check_describe tags/A --all A^0 test_expect_success 'no warning was displayed for A' ' test_cmp err.expect err.actual ' @@ -340,4 +340,8 @@ test_expect_success ULIMIT_STACK_SIZE 'describe works in a deep repo' ' test_cmp expect actual ' +check_describe tags/A --all A +check_describe tags/c --all c +check_describe heads/branch_A --all --match='branch_*' branch_A + test_done |