3e3b9321ca
Mark those remaining tests that pass when run under SANITIZE=leak with TEST_PASSES_SANITIZE_LEAK=true, these were either omitted inf346fcb62a(Merge branch 'ab/mark-leak-free-tests-even-more', 2021-12-15) and5a4f8381b6(Merge branch 'ab/mark-leak-free-tests', 2021-10-25), or have had their memory leaks fixed since then. With this change there's now a a one-to-one mapping between those tests that we have opted-in via "TEST_PASSES_SANITIZE_LEAK=true", and those that pass with the new "check" mode: GIT_TEST_PASSING_SANITIZE_LEAK=check \ GIT_TEST_SANITIZE_LEAK_LOG=true \ make test SANITIZE=leak Note that the "GIT_TEST_SANITIZE_LEAK_LOG=true" is needed due to the edge cases noted in a preceding commit, i.e. in some cases we'd pass the test itself, but still have outstanding leaks due to ignored exit codes. The "GIT_TEST_SANITIZE_LEAK_LOG=true" corrects for that, we're only marking those tests as passing that really don't have any leaks, whether that was reflected in their exit code or not. Note that the change here to "t9100-git-svn-basic.sh" is marking that test as passing under SANITIZE=leak, we're removing a "TEST_FAILS_SANITIZE_LEAK=true" line, not "TEST_PASSES_SANITIZE_LEAK=true". See7a98d9ab00(revisions API: have release_revisions() release "cmdline", 2022-04-13) for the introduction of that t/lib-git-svn.sh-specific variable. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
142 lines
3.6 KiB
Bash
Executable File
142 lines
3.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Return value of diffs'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo "1 " >a &&
|
|
git add . &&
|
|
git commit -m zeroth &&
|
|
echo 1 >a &&
|
|
git add . &&
|
|
git commit -m first &&
|
|
echo 2 >b &&
|
|
git add . &&
|
|
git commit -a -m second
|
|
'
|
|
|
|
test_expect_success 'git diff --quiet -w HEAD^^ HEAD^' '
|
|
git diff --quiet -w HEAD^^ HEAD^
|
|
'
|
|
|
|
test_expect_success 'git diff --quiet HEAD^^ HEAD^' '
|
|
test_must_fail git diff --quiet HEAD^^ HEAD^
|
|
'
|
|
|
|
test_expect_success 'git diff --quiet -w HEAD^ HEAD' '
|
|
test_must_fail git diff --quiet -w HEAD^ HEAD
|
|
'
|
|
|
|
test_expect_success 'git diff-tree HEAD^ HEAD' '
|
|
test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
|
|
'
|
|
test_expect_success 'git diff-tree HEAD^ HEAD -- a' '
|
|
git diff-tree --exit-code HEAD^ HEAD -- a
|
|
'
|
|
test_expect_success 'git diff-tree HEAD^ HEAD -- b' '
|
|
test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD -- b
|
|
'
|
|
test_expect_success 'echo HEAD | git diff-tree --stdin' '
|
|
echo $(git rev-parse HEAD) | test_expect_code 1 git diff-tree --exit-code --stdin
|
|
'
|
|
test_expect_success 'git diff-tree HEAD HEAD' '
|
|
git diff-tree --exit-code HEAD HEAD
|
|
'
|
|
test_expect_success 'git diff-files' '
|
|
git diff-files --exit-code
|
|
'
|
|
test_expect_success 'git diff-index --cached HEAD' '
|
|
git diff-index --exit-code --cached HEAD
|
|
'
|
|
test_expect_success 'git diff-index --cached HEAD^' '
|
|
test_expect_code 1 git diff-index --exit-code --cached HEAD^
|
|
'
|
|
test_expect_success 'git diff-index --cached HEAD^' '
|
|
echo text >>b &&
|
|
echo 3 >c &&
|
|
git add . &&
|
|
test_expect_code 1 git diff-index --exit-code --cached HEAD^
|
|
'
|
|
test_expect_success 'git diff-tree -Stext HEAD^ HEAD -- b' '
|
|
git commit -m "text in b" &&
|
|
test_expect_code 1 git diff-tree -p --exit-code -Stext HEAD^ HEAD -- b
|
|
'
|
|
test_expect_success 'git diff-tree -Snot-found HEAD^ HEAD -- b' '
|
|
git diff-tree -p --exit-code -Snot-found HEAD^ HEAD -- b
|
|
'
|
|
test_expect_success 'git diff-files' '
|
|
echo 3 >>c &&
|
|
test_expect_code 1 git diff-files --exit-code
|
|
'
|
|
test_expect_success 'git diff-index --cached HEAD' '
|
|
git update-index c &&
|
|
test_expect_code 1 git diff-index --exit-code --cached HEAD
|
|
'
|
|
|
|
test_expect_success '--check --exit-code returns 0 for no difference' '
|
|
|
|
git diff --check --exit-code
|
|
|
|
'
|
|
|
|
test_expect_success '--check --exit-code returns 1 for a clean difference' '
|
|
|
|
echo "good" > a &&
|
|
test_expect_code 1 git diff --check --exit-code
|
|
|
|
'
|
|
|
|
test_expect_success '--check --exit-code returns 3 for a dirty difference' '
|
|
|
|
echo "bad " >> a &&
|
|
test_expect_code 3 git diff --check --exit-code
|
|
|
|
'
|
|
|
|
test_expect_success '--check with --no-pager returns 2 for dirty difference' '
|
|
|
|
test_expect_code 2 git --no-pager diff --check
|
|
|
|
'
|
|
|
|
test_expect_success 'check should test not just the last line' '
|
|
echo "" >>a &&
|
|
test_expect_code 2 git --no-pager diff --check
|
|
|
|
'
|
|
|
|
test_expect_success 'check detects leftover conflict markers' '
|
|
git reset --hard &&
|
|
git checkout HEAD^ &&
|
|
echo binary >>b &&
|
|
git commit -m "side" b &&
|
|
test_must_fail git merge main &&
|
|
git add b &&
|
|
test_expect_code 2 git --no-pager diff --cached --check >test.out &&
|
|
test 3 = $(grep "conflict marker" test.out | wc -l) &&
|
|
git reset --hard
|
|
'
|
|
|
|
test_expect_success 'check honors conflict marker length' '
|
|
git reset --hard &&
|
|
echo ">>>>>>> boo" >>b &&
|
|
echo "======" >>a &&
|
|
git diff --check a &&
|
|
test_expect_code 2 git diff --check b &&
|
|
git reset --hard &&
|
|
echo ">>>>>>>> boo" >>b &&
|
|
echo "========" >>a &&
|
|
git diff --check &&
|
|
echo "b conflict-marker-size=8" >.gitattributes &&
|
|
test_expect_code 2 git diff --check b &&
|
|
git diff --check a &&
|
|
git reset --hard
|
|
'
|
|
|
|
test_done
|