On Sun, Jan 10, 2021 at 2:03 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > "Derrick Stolee via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > UPDATE: this is now based on ag/merge-strategies-in-c to avoid conflicts in > > 'seen'. The changes in builtin/rm.c still conflict with > > mt/rm-sparse-checkout, but that branch seems to be waiting for a clearer > > plan on some corner cases. I thought about ejecting it, but 'rm' still uses > > ce_match_stat(), so just dropping the patch gives less of a final stake at > > the end of the series. (I'm still open to it, if necessary.) > > I haven't read this latest iteration myself yet beyond the cover > letter, but tonight's 'seen' has this queued near its tip. I expect > it would either stay there or occasionally ejected, until the base > topic solidifies a bit more. > > > * Methods that know about the 'repo' pointer no longer also have an > > 'istate' pointer and instead prefer 'repo->index' > > > > * This includes the callback_data struct which only has a 'repo' member, no > > 'istate'. > > OK. I looked this version of the series over and did not find anything else about which to comment.
