Re: [PATCH 2/4] push: introduce new push.default mode "simple"

From

Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Date

Apr 22, 2012, 16:24 UTC

Message-ID

<4F9430DA.4030304@in.waw.pl>

In-Reply-To

<20120420203324.GB13103@sigill.intra.peff.net>

Some minor spelling fixes:

> When calling "git push" without argument, we want to allow Git to do
> something simple to explain and safe. push.default=matching is unsafe
> when use to push to shared repositories, and hard to explain to beginners

       used

> in some context. It is debatable whether 'upstream' or 'current' is the

       contexts

> safest or the easiest to explain, so introduce a new mode called 'simple'
> that is the intersection of them: push the upstream branch, but only if

                                    push to the

> it has the same name remotely. If not, give an error that suggest the
> right command to push explicitely to 'upstream' or 'current'.

On 04/20/2012 10:33 PM, Jeff King wrote:

> On Fri, Apr 20, 2012 at 04:59:02PM +0200, Matthieu Moy wrote:
> 
>> it has the same name remotely. If not, give an error that suggest the
>> right command to push explicitely to 'upstream' or 'current'.
> 
> s/suggest/&s/
> 
>> beneficial on the next pull. Lacking better argument, we chose to deny
>> the push, because it will be easier to change in the future is someone
>> shows us wrong.
> 
> s/is/if/
> 
>> Original-patch-by: Jeff King <peff@peff.net>
>> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
>> ---
>> Except for the broken-ness, this adds the last line in the warning message:
>>
>> "To chose either option permanently, read about push.default in git-config(1)"

       choose

> I don't think that makes sense if I have set "push.default" to "simple"
> myself. IOW, shouldn't that get added later, when it eventually becomes
> the default (and then, only when it was chosen because it is the
> default, not because somebody explicitly said they wanted it)?