On Mon, Jun 21, 2021 at 4:12 PM Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > > Alex Henrie wrote: > > On Mon, Jun 21, 2021 at 12:51 PM Felipe Contreras > > <felipe.contreras@xxxxxxxxx> wrote: > > > > > > Alex Henrie wrote: > > > > The eventual goal is to get rid of the default here and make the user > > > > make an educated choice, which does imply some work on the user's > > > > part, but it avoids the massive headaches created by users merging > > > > without understanding what they're doing. > > > > > > Indeed, but any minute change in git's UI is a gargantuan task that > > > takes several years--or even decades--to accomplish, if it ever happens. > > > I started this patch in 2013, and here we are. > > > > Although what needs to be done had been envisioned by some as early as > > 2013, the warning has only been around since Git 2.27 (released in > > June 2020), and it was only restricted to pulls where fast-forwarding > > is impossible in Git 2.31 (released in March 2021). The good news is > > that (unless I'm mistaken) there are no more changes that need to be > > made prior to changing the message from from "advise" to "die". > > There is *a lot* that needs to be done. > > 1. Update the documentation > 2. Add a --merge option (instead of the ackward --no-rebase) > 3. Fix all the wrong behavior with --ff, --no-ff, and -ff-only > 4. Add a pull.mode configuration > 5. Add a configuration for the mode in which we want to die > 6. Fix inconsistencies in the UI I agree with you that the documentation should be updated when the change is made (#1), and maybe there should be a config option to go back to the behavior of warning but doing the merge anyway (#5). The rest I think are things that would be nice to have but don't preclude making the switch because aborting instead of merging would not introduce any new UI limitations or inconsistencies. Of course, it's ultimately up to Junio and the wider Git community, and I would love to hear their thoughts about it. > In the meantime there's no reason to have subpar documentation. My only serious objection to this patch is the instruction to merge if you don't know what to do instead of asking the repository maintainer what to do or reading the Git documentation. I don't have a strong opinion on the rest of the patch. -Alex
