On Sat, Dec 12, 2020 at 10:36 AM Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > Junio C Hamano wrote: > > I am starting to feel myself that "don't do anything if this is not > > a fast-forward" may be something that would have been great if we > > had it from day one but is no longer a feasible default with > > existing users, to be quite honest, so you can count my 20% as > > another example. > > As opposed to virtually everyone in this mailing list that has given an > opinion about the topic in the last 10 years (including you I count 3 > out of literally dozens). A quick update after reading a great deal of mails. The only person I counted in 2013 that was against changing the default is Matthieu Moy, and reading back what he said, even him was in favor of adding a configuration for the new mode [1]. What he was against was making it the default, and adding a warning stating it would be the default. Fortunately my patches introduce the mode [2] without making it necessarily the default (we don't even have to change the warning and say it will be changed in the future [3]). So *nobody* was against the introduction of such mode. Also, after reading the input from GitHub trainers, which Jeff provided [4], perhaps leaving the default as "merge" makes sense. Our curse of knowledge may bias us into thinking the user knows what a rebase is. Maybe a permanent advice warning is the way to go, I'm still mulling it over. > Anyway, this is not relevant today, because you were the one that > proposed to go straight to an error. > > What I propose for today is to introduce the option > "pull.mode=fast-forward", and improve the warning. Not an error. > > That doesn't break the behavior for anyone, including Schindelin. This is still true. We don't lose anything by introducing the mode. We can make the decision to flip the default later (or not). Cheers. [1] https://lore.kernel.org/git/vpqbo41lo2v.fsf@xxxxxxxxxxxx/ [2] https://lore.kernel.org/git/20201208002648.1370414-18-felipe.contreras@xxxxxxxxx/ [3] https://lore.kernel.org/git/20201208002648.1370414-19-felipe.contreras@xxxxxxxxx/ [4] https://lore.kernel.org/git/20130909201751.GA14437@xxxxxxxxxxxxxxxxxxxxx/ -- Felipe Contreras
