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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 20, 2012, 17:55 UTC
Message-ID: <7vehp9x3yz.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1340195750-846-1-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

Show 23 quoted lines

> In preparation for flipping the default to the "simple" mode from
> the "matching" mode that is the historical default, start warning
> users when they rely on unconfigured "git push" to default to the
> "matching" mode.
>
> Also, advertise for 'simple' where 'current' and 'upstream' are advised.
>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>> * mm/push-default-switch-warning (2012-06-06) 1 commit
>>  - push: start warning upcoming default change for push.default
>> 
>> Will merge to 'next'.
>> 
>> Hopwefully we can have a solidly tested series early in 1.7.12 or
>> 1.7.13 at the latest.
>
> I've made a slightly modified version of the patch which adds these
> two lines:
>
> +   "(the 'simple' mode was introduced in Git 1.7.11. Use 'current' instead if\n"
> +   "you sometimes use older versions of Git)");

I am not sure who this wants to help. For people who want to anticipate the future, using anything but 'simple' is not living in the future and waiting for an additional pain coming from the differences between current and simple. If current and simple are similar enough that their differences do not matter, why wait for simple to be available everywhere and switch the default to it, instead of using current as the default in the first place?

So if anything, I'd prefer the above message without "Use 'current' instead" bit.