On Wed, 23 May 2018 12:42:10 +0900 Junio C Hamano <gitster@xxxxxxxxx> wrote: > Somehow this feels more like a WIP than RFC, primarily for two > reasons. It was unclear what "edge" computation is trying to do; it > seems way under-explained, especially the part that takes min-max > while. merging two candidates. Agreed that WIP would be a good designation. I'll make sure that the merging is better explained in the next version. > It also was unclear if this should be organized as a "take it or > leave it" patch like this one, or eventually should be split into > multiple steps when it gets polished enough to be considered for > application, the early ones introducing a separate negotiator module > without changing the common ancestor discovery algorithm at all, > with later steps refining that negotiator and add more efficient > common ancestor discovery process. As for the question of one or (at least) two patches, right now I'm working on a way to simplify what I have (probably to just implementing the "skip exponentially" part you describe in [1]). I think that it will be simple enough to put in one patch, but we can decide once I've completed that patch.