summaryrefslogtreecommitdiff
path: root/t/t2000-conflict-when-checking-files-out.sh
AgeCommit message (Collapse)AuthorFilesLines
2021-11-01leak tests: mark some misc tests as passing with SANITIZE=leakLibravatar Ævar Arnfjörð Bjarmason1-0/+1
As in 7ff24785cb7 (leak tests: mark some misc tests as passing with SANITIZE=leak, 2021-10-12) continue marking various miscellaneous tests as passing when git is compiled with SANITIZE=leak. They'll now be listed as running under the "GIT_TEST_PASSING_SANITIZE_LEAK=true" test mode (the "linux-leaks" CI target). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-10-23t2000: rename and combine checkout clash testsLibravatar Stephen P. Smith1-0/+135
In an earlier patch some tests scripts were renamed and a naming convention was documented. [1] Merge t2000-checkout-cache-clash.sh and t2001-checkout-cache-clash.sh into t2000-conflict-when-checking-files-out.sh. [1] f50c9f76c ("Rename some test scripts and describe the naming convention", 2005-05-15) Signed-off-by: Stephen P. Smith <ischis2@cox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>