Junio C Hamano venit, vidit, dixit 21.09.2017 08:27: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> ... I agree that there is a value in what your patch 2/3 >> wants to do when the current one that is more strict would say >> "there is no known fork-point"---we would gain a way to say "... but >> this is the best guess based on available data that may be better >> than getting no answer." which we lack. >> >> Having said all that, I do not agree with your last sentence in the >> paragraph I quoted above. It is a mere implementation detail to >> consult the reflog to find out the set of "historical tips of the >> Branch"; the current tip by definition is among the commits in that >> set, even when the reflog of Branch is missing. What 4f21454b55 did >> was a reasonable "fix" that is still in line with the definition of >> "--fork-point" from that point of view. >> >> Whether we add a "looser" version of "--fork-point" to the system or >> not, the more strict version should still use the current tip as one >> of the historical tips (i.e. those that we would take from the >> reflog if the reflog were not empty) in the more "strict" mode. The >> looser version may also want to do so as well. > > So, should I mark this in What's cooking report as "expecting a > reroll", anticipating that a new option would be added to trigger > the new & looser behaviour? > I dunno. Some participants in this thread considered my patch to be a fix rather than alternative behaviour. So I hoped for more responses to your response. (Re-adding dscho on cc - our thread graph forked...) Also, I'm undecided about about your reflog argument above - if we leave "--fork-point" to be the current behaviour including Jeff's fix then the documentation would need an even bigger overhaul, because it's neither "reflog also" (as claimed in the doc) nor "reflog only" (as in the original implementation) but "historical tips as inferred from the current value and the reflog". In any case, for two modes we need two names for the options. Maybe --fork-point and --fork-base because in the loose mode, you may get a "base of a strict fork point"? Michael
