aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6438-submodule-directory-file-conflicts.sh
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-05-27 13:46:06 +0200
committerJunio C Hamano <gitster@pobox.com>2024-05-27 11:19:58 -0700
commitcc395d6b47e4af59b3e87a64b34dffa79e8dc262 (patch)
treeb1e71b4797f89fe945f2ee87860ee24bcefa37be /t/t6438-submodule-directory-file-conflicts.sh
parent94e2aa555e7dab4f5296a8dcd8605d751e02b12d (diff)
downloadgit-cc395d6b47e4af59b3e87a64b34dffa79e8dc262.tar.gz
checkout: clarify memory ownership in `unique_tracking_name()`
The function `unique_tracking_name()` returns an allocated string, but does not clearly indicate this because its return type is `const char *` instead of `char *`. This has led to various callsites where we never free its returned memory at all, which causes memory leaks. Plug those leaks and mark now-passing tests as leak free. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6438-submodule-directory-file-conflicts.sh')
-rwxr-xr-xt/t6438-submodule-directory-file-conflicts.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6438-submodule-directory-file-conflicts.sh b/t/t6438-submodule-directory-file-conflicts.sh
index 8df67a0ef9..3594190af8 100755
--- a/t/t6438-submodule-directory-file-conflicts.sh
+++ b/t/t6438-submodule-directory-file-conflicts.sh
@@ -2,6 +2,7 @@
test_description='merge can handle submodules'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh