]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/leakfixes-more'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Jul 2024 21:53:10 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jul 2024 21:53:10 +0000 (14:53 -0700)
More memory leaks have been plugged.

* ps/leakfixes-more: (29 commits)
  builtin/blame: fix leaking ignore revs files
  builtin/blame: fix leaking prefixed paths
  blame: fix leaking data for blame scoreboards
  line-range: plug leaking find functions
  merge: fix leaking merge bases
  builtin/merge: fix leaking `struct cmdnames` in `get_strategy()`
  sequencer: fix memory leaks in `make_script_with_merges()`
  builtin/clone: plug leaking HEAD ref in `wanted_peer_refs()`
  apply: fix leaking string in `match_fragment()`
  sequencer: fix leaking string buffer in `commit_staged_changes()`
  commit: fix leaking parents when calling `commit_tree_extended()`
  config: fix leaking "core.notesref" variable
  rerere: fix various trivial leaks
  builtin/stash: fix leak in `show_stash()`
  revision: free diff options
  builtin/log: fix leaking commit list in git-cherry(1)
  merge-recursive: fix memory leak when finalizing merge
  builtin/merge-recursive: fix leaking object ID bases
  builtin/difftool: plug memory leaks in `run_dir_diff()`
  object-name: free leaking object contexts
  ...

35 files changed:
1  2 
apply.c
apply.h
blame.c
builtin/am.c
builtin/archive.c
builtin/blame.c
builtin/clone.c
builtin/commit.c
builtin/difftool.c
builtin/log.c
builtin/merge.c
builtin/sparse-checkout.c
bundle.c
commit.c
commit.h
config.c
diff-lib.c
diff.c
help.c
list-objects-filter.c
log-tree.c
merge-ort.c
merge-ort.h
merge-recursive.c
notes-merge.c
notes-utils.c
notes.c
object-name.c
rerere.c
revision.c
sequencer.c
t/t4153-am-resume-override-opts.sh
t/t5605-clone-local.sh
t/t7006-pager.sh
t/t7600-merge.sh

diff --cc apply.c
Simple merge
diff --cc apply.h
Simple merge
diff --cc blame.c
Simple merge
diff --cc builtin/am.c
Simple merge
Simple merge
diff --cc builtin/blame.c
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge
diff --cc bundle.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge
diff --cc config.c
Simple merge
diff --cc diff-lib.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc help.c
Simple merge
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc merge-ort.c
Simple merge
diff --cc merge-ort.h
Simple merge
Simple merge
diff --cc notes-merge.c
Simple merge
diff --cc notes-utils.c
Simple merge
diff --cc notes.c
Simple merge
diff --cc object-name.c
Simple merge
diff --cc rerere.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc sequencer.c
Simple merge
index a32cec42aa4ba02f0ff563cc3d675e2d0c24df06,6bc377b917f2ef1465f8efa48a42eb4aea60dff0..a4d0c03ca69444e5b8544885b1a0919ae43aaad6
@@@ -2,7 -2,9 +2,8 @@@
  
  test_description='git-am command-line options override saved options'
  
+ TEST_PASSES_SANITIZE_LEAK=true
  . ./test-lib.sh
 -. "$TEST_DIRECTORY"/lib-terminal.sh
  
  format_patch () {
        git format-patch --stdout -1 "$1" >"$1".eml
Simple merge
Simple merge
Simple merge