undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

describe tests: refactor away from glob matching

Browse Source 
Change the glob matching via a "case" statement to a "test_cmp" after
we've stripped out the hash-specific g<hash-abbrev>
suffix. 5312ab11fbf (Add describe test., 2007-01-13).

This means that we can use test_cmp to compare the output. I could
omit the "-8" change of e.g. "A-*" to "A-8-gHASH", but I think it
makes sense to test that here explicitly. It means you need to add new
tests to the bottom of the file, but that's not a burden in this case.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2021-04-12 13:21:44 +02:00 committed by Junio C Hamano
parent 2df546e17f
commit a46a848296
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
t/t6120-describe.sh
View File

@ -21,12 +21,10 @@ check_describe () {
shift shift
describe_opts="$@" describe_opts="$@"
test_expect_success "describe $describe_opts" ' test_expect_success "describe $describe_opts" '
R=$(git describe $describe_opts 2>err.actual) && git describe $describe_opts 2>err.actual >raw &&
case "$R" in sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
$expect) echo happy ;; echo "$expect" >expect &&
*) echo "Oops - $R is not $expect" && test_cmp expect actual
false ;;
esac
' '
} }
@ -59,29 +57,29 @@ test_expect_success setup '
test_commit --no-tag x file test_commit --no-tag x file
' '
check_describe A-* HEAD check_describe A-8-gHASH HEAD
check_describe A-* HEAD^ check_describe A-7-gHASH HEAD^
check_describe R-* HEAD^^ check_describe R-2-gHASH HEAD^^
check_describe A-* HEAD^^2 check_describe A-3-gHASH HEAD^^2
check_describe B HEAD^^2^ check_describe B HEAD^^2^
check_describe R-* HEAD^^^ check_describe R-1-gHASH HEAD^^^
check_describe c-* --tags HEAD check_describe c-7-gHASH --tags HEAD
check_describe c-* --tags HEAD^ check_describe c-6-gHASH --tags HEAD^
check_describe e-* --tags HEAD^^ check_describe e-1-gHASH --tags HEAD^^
check_describe c-* --tags HEAD^^2 check_describe c-2-gHASH --tags HEAD^^2
check_describe B --tags HEAD^^2^ check_describe B --tags HEAD^^2^
check_describe e --tags HEAD^^^ check_describe e --tags HEAD^^^
check_describe heads/main --all HEAD check_describe heads/main --all HEAD
check_describe tags/c-* --all HEAD^ check_describe tags/c-6-gHASH --all HEAD^
check_describe tags/e --all HEAD^^^ check_describe tags/e --all HEAD^^^
check_describe B-0-* --long HEAD^^2^ check_describe B-0-gHASH --long HEAD^^2^
check_describe A-3-* --long HEAD^^2 check_describe A-3-gHASH --long HEAD^^2
check_describe c-7-* --tags check_describe c-7-gHASH --tags
check_describe e-3-* --first-parent --tags check_describe e-3-gHASH --first-parent --tags
test_expect_success 'describe --contains defaults to HEAD without commit-ish' ' test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
echo "A^0" >expect && echo "A^0" >expect &&
@ -102,7 +100,7 @@ test_expect_success 'rename tag A to Q locally' '
cat - >err.expect <<EOF cat - >err.expect <<EOF
warning: tag 'Q' is externally known as 'A' warning: tag 'Q' is externally known as 'A'
EOF EOF
check_describe A-* HEAD check_describe A-8-gHASH HEAD
test_expect_success 'warning was displayed for Q' ' test_expect_success 'warning was displayed for Q' '
test_cmp err.expect err.actual test_cmp err.expect err.actual
' '
@ -129,22 +127,22 @@ test_expect_success 'rename tag Q back to A' '
' '
test_expect_success 'pack tag refs' 'git pack-refs' test_expect_success 'pack tag refs' 'git pack-refs'
check_describe A-* HEAD check_describe A-8-gHASH HEAD
test_expect_success 'describe works from outside repo using --git-dir' ' test_expect_success 'describe works from outside repo using --git-dir' '
git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" && git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
git --git-dir "$TRASH_DIRECTORY/bare" describe >out && git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out grep -E "^A-8-g[0-9a-f]+$" out
' '
check_describe "A-*[0-9a-f]" --dirty check_describe "A-8-gHASH" --dirty
test_expect_success 'describe --dirty with --work-tree' ' test_expect_success 'describe --dirty with --work-tree' '
( (
cd "$TEST_DIRECTORY" && cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out" git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
) && ) &&
grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out grep -E "^A-8-g[0-9a-f]+$" out
' '
test_expect_success 'set-up dirty work tree' ' test_expect_success 'set-up dirty work tree' '
@ -157,7 +155,7 @@ test_expect_success 'describe --dirty with --work-tree (dirty)' '
cd "$TEST_DIRECTORY" && cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out" git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
) && ) &&
grep -E "^A-[1-9][0-9]?-g[0-9a-f]+-dirty$" out && grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
test_cmp expected out test_cmp expected out
' '
@ -167,7 +165,7 @@ test_expect_success 'describe --dirty=.mod with --work-tree (dirty)' '
cd "$TEST_DIRECTORY" && cd "$TEST_DIRECTORY" &&
git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out" git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
) && ) &&
grep -E "^A-[1-9][0-9]?-g[0-9a-f]+.mod$" out && grep -E "^A-8-g[0-9a-f]+.mod$" out &&
test_cmp expected out test_cmp expected out
' '
@ -191,21 +189,21 @@ test_expect_success 'set-up matching pattern tests' '
' '
check_describe "test-annotated-*" --match="test-*" check_describe "test-annotated-3-gHASH" --match="test-*"
check_describe "test1-lightweight-*" --tags --match="test1-*" check_describe "test1-lightweight-2-gHASH" --tags --match="test1-*"
check_describe "test2-lightweight-*" --tags --match="test2-*" check_describe "test2-lightweight-1-gHASH" --tags --match="test2-*"
check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^ check_describe "test2-lightweight-0-gHASH" --long --tags --match="test2-*" HEAD^
check_describe "test2-lightweight-*" --long --tags --match="test1-*" --match="test2-*" HEAD^ check_describe "test2-lightweight-0-gHASH" --long --tags --match="test1-*" --match="test2-*" HEAD^
check_describe "test2-lightweight-*" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^ check_describe "test2-lightweight-0-gHASH" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^
check_describe "test1-lightweight-*" --long --tags --match="test1-*" --match="test3-*" HEAD check_describe "test1-lightweight-2-gHASH" --long --tags --match="test1-*" --match="test3-*" HEAD
check_describe "test1-lightweight-*" --long --tags --match="test3-*" --match="test1-*" HEAD check_describe "test1-lightweight-2-gHASH" --long --tags --match="test3-*" --match="test1-*" HEAD
test_expect_success 'set-up branches' ' test_expect_success 'set-up branches' '
git branch branch_A A && git branch branch_A A &&
@ -215,11 +213,11 @@ test_expect_success 'set-up branches' '
git update-ref refs/original/original_branch_A test-annotated~2 git update-ref refs/original/original_branch_A test-annotated~2
' '
check_describe "heads/branch_A*" --all --match="branch_*" --exclude="branch_C" HEAD check_describe "heads/branch_A-11-gHASH" --all --match="branch_*" --exclude="branch_C" HEAD
check_describe "remotes/origin/remote_branch_A*" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD check_describe "remotes/origin/remote_branch_A-11-gHASH" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
check_describe "original/original_branch_A*" --all test-annotated~1 check_describe "original/original_branch_A-6-gHASH" --all test-annotated~1
test_expect_success '--match does not work for other types' ' test_expect_success '--match does not work for other types' '
test_must_fail git describe --all --match="*original_branch_*" test-annotated~1 test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
@ -489,7 +487,7 @@ test_expect_success 'describe commits with disjoint bases' '
git tag B -a -m B && git tag B -a -m B &&
git merge --no-ff --allow-unrelated-histories main -m x && git merge --no-ff --allow-unrelated-histories main -m x &&
check_describe "A-3-*" HEAD check_describe "A-3-gHASH" HEAD
) )
' '
@ -515,7 +513,7 @@ test_expect_success 'describe commits with disjoint bases 2' '
git tag B -a -m B && git tag B -a -m B &&
git merge --no-ff --allow-unrelated-histories main -m x && git merge --no-ff --allow-unrelated-histories main -m x &&
check_describe "B-3-*" HEAD check_describe "B-3-gHASH" HEAD
) )
' '