On Mon, Sep 27 2021, Junio C Hamano wrote: > * ns/batched-fsync (2021-09-27) 8 commits > - core.fsyncobjectfiles: performance tests for add and stash > - core.fsyncobjectfiles: tests for batch mode > - unpack-objects: use the bulk-checkin infrastructure > - update-index: use the bulk-checkin infrastructure > - core.fsyncobjectfiles: add windows support for batch mode > - core.fsyncobjectfiles: batched disk flushes > - bulk-checkin: rename 'state' variable and separate 'plugged' boolean > - object-file.c: do not rename in a temp odb > > The "core.fsyncobjectfiles" configuration variable can now be set > to "batch" for improved performance. > > Will merge to 'next'? This version was significantly re-rolled in response to my feedback, I haven't had time to look at this latest version in detail, but will try to do so soon. I did note in https://lore.kernel.org/git/87v92lxhh4.fsf@xxxxxxxxxxxxxxxxxxx/ that it one of Elijah's in-flight seem to have independently come up with slightly incompatible versions of the same tmp-objdir.c API.... > * en/remerge-diff (2021-08-31) 7 commits > - doc/diff-options: explain the new --remerge-diff option > - show, log: provide a --remerge-diff capability > - tmp-objdir: new API for creating and removing primary object dirs > - merge-ort: capture and print ll-merge warnings in our preferred fashion > - ll-merge: add API for capturing warnings in a strbuf instead of stderr > - merge-ort: add ability to record conflict messages in a file > - merge-ort: mark a few more conflict messages as omittable > > A new presentation for two-parent merge "--remerge-diff" can be > used to show the difference between mechanical (and possibly > conflicted) merge results and the recorded resolution. > > Will merge to 'next'? ...i.e. this series
