On Fri, Aug 9, 2024 at 6:31 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > remerge-diff: lazily prpare temporary objdir on demand s/prpare/prepare/ > It is error prone for each caller that sets revs.remerge_diff bit > to be responsible for preparing a temporary object directory and > rotate it into the list of alternate object stores, making it the > primary object store. > > Instead, remove the code to set up and arrange the temporary object > directory from the current callers and implement it in the code that > runs remerge-diff logic. The code to undo the futzing of the list > of alternate object store is still spread across the callers, but we > will deal with it in future steps. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>