summaryrefslogtreecommitdiff
path: root/t/t7604-merge-custom-message.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-25 16:06:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-25 16:06:59 -0700
commit54c4f8ce52f20ea1be99c780ce19867964f430b7 (patch)
tree7e3f9f4a7c804821f32750f7d7d5cd28bf71856a /t/t7604-merge-custom-message.sh
parentMerge branch 'ab/mark-leak-free-tests' (diff)
parentmerge: add missing strbuf_release() (diff)
downloadtgif-54c4f8ce52f20ea1be99c780ce19867964f430b7.tar.xz
Merge branch 'ab/mark-leak-free-tests-more'
Bunch of tests are marked as "passing leak check". * ab/mark-leak-free-tests-more: merge: add missing strbuf_release() ls-files: add missing string_list_clear() ls-files: fix a trivial dir_clear() leak tests: fix test-oid-array leak, test in SANITIZE=leak tests: fix a memory leak in test-oidtree.c tests: fix a memory leak in test-parse-options.c tests: fix a memory leak in test-prio-queue.c
Diffstat (limited to 't/t7604-merge-custom-message.sh')
-rwxr-xr-xt/t7604-merge-custom-message.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index cd4f9607dc..eca7555101 100755
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -4,6 +4,7 @@ test_description='git merge
Testing merge when using a custom message for the merge commit.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
create_merge_msgs() {