]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'xx/diff-tree-remerge-diff-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Aug 2024 20:22:16 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Aug 2024 20:22:16 +0000 (13:22 -0700)
commit0da7673a519cbebd44258ac4b12e7ad481a37f84
tree046109f27592bbcc31df1e2953823011bab537a7
parente7f86cb69de9c3b95c8c8816b51621c1d7910e02
parenta77554ea0972e4ec3518fb8fb0b2582c76cf3105
Merge branch 'xx/diff-tree-remerge-diff-fix'

"git rev-list ... | git diff-tree -p --remerge-diff --stdin" should
behave more or less like "git log -p --remerge-diff" but instead it
crashed, forgetting to prepare a temporary object store needed.

* xx/diff-tree-remerge-diff-fix:
  diff-tree: fix crash when used with --remerge-diff
builtin/diff-tree.c