mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 03:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

builtin/diff: free symmetric diff members

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt 2024-08-14 08:52:58 +02:00 committed by Junio C Hamano
parent 36f971f861
commit 77d4b3dd73
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/diff.c
View File

@ -388,6 +388,11 @@ static void symdiff_prepare(struct rev_info *rev, struct symdiff *sym)
sym->skip = map; sym->skip = map;
} }
static void symdiff_release(struct symdiff *sdiff)
{
bitmap_free(sdiff->skip);
}
int cmd_diff(int argc, const char **argv, const char *prefix) int cmd_diff(int argc, const char **argv, const char *prefix)
{ {
int i; int i;
@ -619,6 +624,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
refresh_index_quietly(); refresh_index_quietly();
release_revisions(&rev); release_revisions(&rev);
object_array_clear(&ent); object_array_clear(&ent);
symdiff_release(&sdiff);
UNLEAK(blob); UNLEAK(blob);
return result; return result;
} }

1
t/t4068-diff-symmetric-merge-base.sh
View File

@ -5,6 +5,7 @@ test_description='behavior of diff with symmetric-diff setups and --merge-base'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
# build these situations: # build these situations:

1
t/t4108-apply-threeway.sh
View File

@ -5,6 +5,7 @@ test_description='git apply --3way'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
print_sanitized_conflicted_diff () { print_sanitized_conflicted_diff () {