]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'xx/diff-tree-remerge-diff-fix' into maint-2.46
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Aug 2024 18:10:24 +0000 (11:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Aug 2024 18:10:25 +0000 (11:10 -0700)
"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

1  2 
builtin/diff-tree.c

Simple merge