diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-08-14 08:52:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-14 19:08:02 +0200 |
| commit | 77d4b3dd73c44b2c617345a6d9686d2f7f5b8a68 (patch) | |
| tree | ebb576a3a572e306176112c38971348363d70800 /t/t4108-apply-threeway.sh | |
| parent | diff: free state populated via options (diff) | |
| download | git-77d4b3dd73c44b2c617345a6d9686d2f7f5b8a68.tar.xz git-77d4b3dd73c44b2c617345a6d9686d2f7f5b8a68.zip | |
builtin/diff: free symmetric diff members
We populate a `struct symdiff` in case the user has requested a
symmetric diff. Part of this is to populate a `skip` bitmap that
indicates which commits shall be ignored in the diff. But while this
bitmap is dynamically allocated, we never free it.
Fix this by introducing and calling a new `symdiff_release()` function
that does this for us.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rwxr-xr-x | t/t4108-apply-threeway.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh index c558282bc0..3211e1e65f 100755 --- a/t/t4108-apply-threeway.sh +++ b/t/t4108-apply-threeway.sh @@ -5,6 +5,7 @@ test_description='git apply --3way' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh print_sanitized_conflicted_diff () { |