Re: Pull is Evil

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 2, 2014, 01:14 UTC
Message-ID: <5362f1755f2a9_d1310572f0fa@nysa.notmuch>
In-Reply-To: <20140502011004.GD28634@odin.tremily.us>

W. Trevor King wrote:

Show 6 quoted lines

> On Thu, May 01, 2014 at 07:37:04PM -0500, Felipe Contreras wrote:
> > If that was the case the user wouls have run `git merge
> > --no-ff`. Only expereinced users would answer 'no'.
> 
> Folks who are setting any ff options don't need any of these training
> wheels.

Indeed.

Show 6 quoted lines

> My proposed --prompt behavior is for folks who think “I often run this
> command without thinking it through all the way.  I'm also not used to
> reading Git's output and using 'reset --hard' with the reflog to
> reverse changes.  Instead of trusting me to only say what I mean or
> leaving me to recover from mistakes, please tell me what's about to
> change and let me opt out if I've changed my mind.”

Unfortunately those folks by definition wouldn't know about the --prompt option.

Show 5 quoted lines

> > For example, I'm thinking that by default when the a fast-forward is
> > possible, just do it, …
> 
> But just because a ff is possible doesn't mean it's what the
> user/project wants.

Yeah, so? We cannot read minds, especially not the minds of the people that are not sitted in from of the computer.

> It may be the most likely guess, but why guess when they've explicitly
> asked for a prompt?

*If* the user has specifically asked for a prompt, sure, ask. But I'm not particularly interested in that, because I'm certain very very few people would use --prompt.

I'm interested in the defaults.

-- 
Felipe Contreras