From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Jul 2024 21:53:10 +0000 (-0700)
Subject: Merge branch 'ps/leakfixes-more'
X-Git-Tag: v2.46.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3997614c249b4b475d07c00556446d8b698d1a49;p=thirdparty%2Fgit.git

Merge branch 'ps/leakfixes-more'

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
  ...
---

3997614c249b4b475d07c00556446d8b698d1a49
diff --cc t/t4153-am-resume-override-opts.sh
index a32cec42aa,6bc377b917..a4d0c03ca6
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@@ -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