summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-12-15 09:39:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-15 09:39:46 -0800
commitf346fcb62a09b3518c291c5ab4449b0b10450acf (patch)
tree27f2abd67b64acd544b126f6b1e2381d7d21e83f /t/t1002-read-tree-m-u-2way.sh
parentMerge branch 'hn/reftable' (diff)
parentleak tests: mark some fast-import tests as passing with SANITIZE=leak (diff)
downloadtgif-f346fcb62a09b3518c291c5ab4449b0b10450acf.tar.xz
Merge branch 'ab/mark-leak-free-tests-even-more'
More tests are marked as leak-free. * ab/mark-leak-free-tests-even-more: leak tests: mark some fast-import tests as passing with SANITIZE=leak leak tests: mark some config tests as passing with SANITIZE=leak leak tests: mark some status tests as passing with SANITIZE=leak leak tests: mark some clone tests as passing with SANITIZE=leak leak tests: mark some add tests as passing with SANITIZE=leak leak tests: mark some diff tests as passing with SANITIZE=leak leak tests: mark some apply tests as passing with SANITIZE=leak leak tests: mark some notes tests as passing with SANITIZE=leak leak tests: mark some update-index tests as passing with SANITIZE=leak leak tests: mark some rev-parse tests as passing with SANITIZE=leak leak tests: mark some rev-list tests as passing with SANITIZE=leak leak tests: mark some misc tests as passing with SANITIZE=leak leak tests: mark most gettext tests as passing with SANITIZE=leak leak tests: mark "sort" test as passing SANITIZE=leak leak tests: mark a read-tree test as passing SANITIZE=leak
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
-rwxr-xr-xt/t1002-read-tree-m-u-2way.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 9c05f5e1f5..ca5c5510c7 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -8,6 +8,8 @@ test_description='Two way merge with read-tree -m -u $H $M
This is identical to t1001, but uses -u to update the work tree as well.
'
+
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh