aboutsummaryrefslogtreecommitdiffstats
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-06-11 11:20:38 +0200
committerJunio C Hamano <gitster@pobox.com>2024-06-11 13:15:07 -0700
commitc6eb58bfb19a0840841934b91613ea53f0da8651 (patch)
tree37e3c4304e8b4b9e140fce4b3bbe4911fb42f061 /t/t3309-notes-merge-auto-resolve.sh
parentrerere: fix various trivial leaks (diff)
downloadgit-c6eb58bfb19a0840841934b91613ea53f0da8651.tar.gz
git-c6eb58bfb19a0840841934b91613ea53f0da8651.zip
config: fix leaking "core.notesref" variable
The variable used to track the "core.notesref" config is not getting freed before we assign to it and thus leaks. Fix this. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
-rwxr-xr-xt/t3309-notes-merge-auto-resolve.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3309-notes-merge-auto-resolve.sh b/t/t3309-notes-merge-auto-resolve.sh
index 9bd5dbf341..f55277f499 100755
--- a/t/t3309-notes-merge-auto-resolve.sh
+++ b/t/t3309-notes-merge-auto-resolve.sh
@@ -5,6 +5,7 @@
test_description='Test notes merging with auto-resolving strategies'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Set up a notes merge scenario with all kinds of potential conflicts