Fix minor issue with t6120-describe.
PATCH 1/2 Fix minor issue with t6120-describe.
The tests for B wind up matching exactly, as in the test repository B is exactly HEAD^^2^. So we cannot match on B-* as we will never get additional SHA1 data appended to the tag name.
Signed-off-by Shawn O. Pearce <[email protected]>
--- t/t6120-describe.sh | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-)
t/t6120-describe.sh +10 -10
@@ -18,8 +18,8 @@ check_describe () { R=$(git describe "$@") && test_expect_success "describe $*" ' case "$R" in - "$expect"-*) echo happy ;; - *) echo "Oops - $R??? expected $expect"; + $expect) echo happy ;; + *) echo "Oops - $R is not $expect"; false ;; esac '
@@ -82,16 +82,16 @@ test_expect_success setup ' ' -check_describe A HEAD -check_describe A HEAD^ -check_describe D HEAD^^ -check_describe A HEAD^^2 +check_describe A-* HEAD +check_describe A-* HEAD^ +check_describe D-* HEAD^^ +check_describe A-* HEAD^^2 check_describe B HEAD^^2^ -check_describe A --tags HEAD -check_describe A --tags HEAD^ -check_describe D --tags HEAD^^ -check_describe A --tags HEAD^^2 +check_describe A-* --tags HEAD +check_describe A-* --tags HEAD^ +check_describe D-* --tags HEAD^^ +check_describe A-* --tags HEAD^^2 check_describe B --tags HEAD^^2^ test_done
Signature · 1 line
1.5.0.rc1.g4494