Hi, On Thu, Nov 9, 2023 at 5:21 AM Taylor Blau <me@xxxxxxxxxxxx> wrote: > > On Thu, Nov 09, 2023 at 02:40:28AM +0900, Junio C Hamano wrote: > > * tb/merge-tree-write-pack (2023-10-23) 5 commits > > - builtin/merge-tree.c: implement support for `--write-pack` > > - bulk-checkin: introduce `index_tree_bulk_checkin_incore()` > > - bulk-checkin: introduce `index_blob_bulk_checkin_incore()` > > - bulk-checkin: generify `stream_blob_to_pack()` for arbitrary types > > - bulk-checkin: extract abstract `bulk_checkin_source` > > > > "git merge-tree" learned "--write-pack" to record its result > > without creating loose objects. > > > > Comments? > > source: <cover.1698101088.git.me@xxxxxxxxxxxx> > [...] > I am fairly confident that tb/merge-tree-write-pack is ready to go. I'll > spin off a separate thread based on that branch and cc/git-replay as a > non-RFC series that extends this approach to 'git replay', so we'll be > ready to go there once Christian's series progresses. Sorry for being so late to review. I posted some comments on patch 5 in relation to repeated file merges within a single (non-recursive) merge, and in relation to recursive merges. Both are cases that'd be really easy to miss if you're not familiar with the merge code, but I think will cause the code to die with fatal errors. I provided my guesses at some potential fixes for both issues.
