Re: [PATCH] push: start warning upcoming default change for push.default

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 20, 2012, 19:31 UTC
Message-ID: <7va9zxvkyp.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpqpq8t96zw.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 6 quoted lines

> So, the long term goal is really to switch to 'simple', but people who
> use different versions of Git won't be able to use it before a few
> years. These people have several options:
>
> 1) Keep push.default unset. This is not acceptable because they don't
>    want the big fat warning each time they push.

Yes, to them one of 'simple', 'current' or 'upstream' would be sensible (but they need to read up on them to see which one they want).

> 2) Set push.default to 'matching', to keep the old behavior and squelsh
>    the warning. If they go this way, they will never see the default
>    change.

This is not the audience of the quoted part of the message i.e. "If you want to use it before default changes". These people fall into the "If you want to keep the current default, set push.default to 'matching'" category, so it is irrelevant to the discussion.

Show 5 quoted lines

> 3) Set push.default to 'current', in which case they have the same
>    behavior as 'simple', except for the safety feature of 'simple'
>    (refuse to push when the name doesn't match the upstream). They can't
>    expect anything better anyway since they are sometimes using a
>    machine which doesn't support 'simple' anyway.

And they will be frozen to 'current' even after their sysadmins update the version of git that support 'simple'.

Telling somebody who would blindly follow what was suggested to use 'current' is what bothers me.