diff options
| author | René Scharfe <l.s.r@web.de> | 2024-05-01 12:26:16 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-01 18:44:10 +0200 |
| commit | a5a4cb7b278b53a6c490dd249eadedb4cc306fab (patch) | |
| tree | 4a33fc749da810b6029f9e5177096b09fbfa2b9a /diff-lib.c | |
| parent | Merge branch 'rs/diff-parseopts' (diff) | |
| download | git-a5a4cb7b278b53a6c490dd249eadedb4cc306fab.tar.xz git-a5a4cb7b278b53a6c490dd249eadedb4cc306fab.zip | |
diff-lib: stop calling diff_setup_done() in do_diff_cache()
d44e5267ea (diff-lib: plug minor memory leaks in do_diff_cache(),
2020-11-14) added the call to diff_setup_done() to release the memory
of the parseopt member of struct diff_options that repo_init_revisions()
had allocated via repo_diff_setup() and prep_parse_options().
189e97bc4b (diff: remove parseopts member from struct diff_options,
2022-12-01) did away with that allocation; diff_setup_done() doesn't
release any memory anymore. So stop calling this function on the blank
diffopt member before it is overwritten, as this is no longer necessary.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | diff-lib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/diff-lib.c b/diff-lib.c index 2edea41a23..b22394ea71 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -641,7 +641,6 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt) repo_init_revisions(opt->repo, &revs, NULL); copy_pathspec(&revs.prune_data, &opt->pathspec); - diff_setup_done(&revs.diffopt); revs.diffopt = *opt; if (diff_cache(&revs, tree_oid, NULL, 1)) |