summaryrefslogtreecommitdiff
path: root/t/t6120-describe.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-01-23 21:16:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-23 21:16:28 (GMT)
commitfac64e011f1b1ecabcccf7ad2511efcac3e26bdc (patch)
treec42dd7ee0406e30714e52ac6381327c5b62d2432 /t/t6120-describe.sh
parent59c276cf4da0705064c32c9dba54baefa282ea55 (diff)
parent1bba00130a1a0332ec0ad2f878a09ca9b2b18ee2 (diff)
downloadgit-fac64e011f1b1ecabcccf7ad2511efcac3e26bdc.zip
git-fac64e011f1b1ecabcccf7ad2511efcac3e26bdc.tar.gz
git-fac64e011f1b1ecabcccf7ad2511efcac3e26bdc.tar.bz2
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/t6120-describe.sh')
-rwxr-xr-xt/t6120-describe.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 3e3fb46..a5d9015 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