Re: [PATCH v3] build: add default aliases

From: Jeff King <peff@peff.net>
Date: Sep 24, 2013, 05:37 UTC
Message-ID: <20130924053712.GA6114@sigill.intra.peff.net>
In-Reply-To: <CAMP44s1tirA5w91L2YomaduZVkqL3=n1j79eoueB6XeGuyY3Mw@mail.gmail.com>

On Tue, Sep 24, 2013 at 12:32:46AM -0500, Felipe Contreras wrote:

Show 25 quoted lines

> > You are making things more consistent for people who already define
> > those aliases in the same way (they are available everywhere, even if
> > they have not moved their config to a new installation), but less so for
> > people who define them differently. Rather than get an obvious:
> >
> >   git: 'co' is not a git command. See 'git --help'.
> >
> > the result will be subtly different (especially so in the case of
> > "commit" versus "commit -a").
> 
> Before:
> 
> # machine A: git ci
> git: 'ca' is not a git command. See 'git --help'.
> 
> # machine B: git ci
> commits
> 
> After:
> 
> # machine A: git ci
> no changes added to commit (use "git add" and/or "git commit -a")
> 
> # machine B: git ci
> commits

That is the output if there are no files to commit. What about while resolving a merge, or after using "git add" on a path? In that case we create a commit, but it is subtly different than what the user intended.

I think for the merge case, it is probably OK, as the "surprise" should always go in the safe direction (user expects "commit -a", gets "commit", and commit balks). But the other omits intended files from the commit.

-Peff