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 /t | |
| 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 't')
| -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 3e3fb462a0..a5d9015024 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 ' @@ -374,4 +374,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 |