]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 164cffa a77554e)
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)
commit5072ad82609b6ed8dc1cc193da8c56f7f9b7d0f3
treef32e120ad54793de26216cd20ca2d3041fcac57atree
parent164cffa35c487f46fa1483ae4a616c45fd3a2bdfcommit | diff
parenta77554ea0972e4ec3518fb8fb0b2582c76cf3105commit | diff
Merge branch 'xx/diff-tree-remerge-diff-fix' into maint-2.46

"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 diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.