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>
78 lines
2.0 KiB
Bash
Executable File
78 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='checkout -m -- <conflicted path>
|
|
|
|
Ensures that checkout -m on a resolved file restores the conflicted file'
|
|
|
|
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 '
|
|
test_tick &&
|
|
test_commit both.txt both.txt initial &&
|
|
git branch topic &&
|
|
test_commit modified_in_main both.txt in_main &&
|
|
test_commit added_in_main each.txt in_main &&
|
|
git checkout topic &&
|
|
test_commit modified_in_topic both.txt in_topic &&
|
|
test_commit added_in_topic each.txt in_topic
|
|
'
|
|
|
|
test_expect_success 'git merge main' '
|
|
test_must_fail git merge main
|
|
'
|
|
|
|
clean_branchnames () {
|
|
# Remove branch names after conflict lines
|
|
sed 's/^\([<>]\{5,\}\) .*$/\1/'
|
|
}
|
|
|
|
test_expect_success '-m restores 2-way conflicted+resolved file' '
|
|
cp each.txt each.txt.conflicted &&
|
|
echo resolved >each.txt &&
|
|
git add each.txt &&
|
|
git checkout -m -- each.txt &&
|
|
clean_branchnames <each.txt >each.txt.cleaned &&
|
|
clean_branchnames <each.txt.conflicted >each.txt.conflicted.cleaned &&
|
|
test_cmp each.txt.conflicted.cleaned each.txt.cleaned
|
|
'
|
|
|
|
test_expect_success '-m restores 3-way conflicted+resolved file' '
|
|
cp both.txt both.txt.conflicted &&
|
|
echo resolved >both.txt &&
|
|
git add both.txt &&
|
|
git checkout -m -- both.txt &&
|
|
clean_branchnames <both.txt >both.txt.cleaned &&
|
|
clean_branchnames <both.txt.conflicted >both.txt.conflicted.cleaned &&
|
|
test_cmp both.txt.conflicted.cleaned both.txt.cleaned
|
|
'
|
|
|
|
test_expect_success 'force checkout a conflict file creates stage zero entry' '
|
|
git init co-force &&
|
|
(
|
|
cd co-force &&
|
|
echo a >a &&
|
|
git add a &&
|
|
git commit -ama &&
|
|
A_OBJ=$(git rev-parse :a) &&
|
|
git branch topic &&
|
|
echo b >a &&
|
|
git commit -amb &&
|
|
B_OBJ=$(git rev-parse :a) &&
|
|
git checkout topic &&
|
|
echo c >a &&
|
|
C_OBJ=$(git hash-object a) &&
|
|
git checkout -m main &&
|
|
test_cmp_rev :1:a $A_OBJ &&
|
|
test_cmp_rev :2:a $B_OBJ &&
|
|
test_cmp_rev :3:a $C_OBJ &&
|
|
git checkout -f topic &&
|
|
test_cmp_rev :0:a $A_OBJ
|
|
)
|
|
'
|
|
|
|
test_done
|