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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 21, 2012, 17:00 UTC
Message-ID: <7vobocsipo.fsf@alter.siamese.dyndns.org>
In-Reply-To: <vpqd34su0io.fsf@bauges.imag.fr>

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

Show 15 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
>> Perhaps we should say more to help people decide which one to choose
>> in this message.
> [...]
>>     You can squelch this message by picking your preferred default now,
>>     e.g. running one of these:
>>
>>             git config push.default matching
>>             git config push.default simple
>>             git config push.default current
>
> I don't see any added value. Seeing this, it's less clear to the user,
> and he may chose 'simple', and then complain that it breaks his older
> Git.

Re-read the part you omitted with [...]. Doesn't it say something about "only available"?

> Really, if 'simple' isn't an option for someone, why should we make
> this someone think before chosing between 'current' an 'simple'?

This is not about choosing between simple and current when both are available. As [...] part tries to clearly state (and if it is unclear, please clarify it further), the new default "simple" is only available in certain versions, and 'current' is the closest approximation for other versions. So even though there are three choices, it is really about choosing between 'matching' (push all relevant and current branch does not matter) and 'simple/current' (push current branch only). We could make it like this:

	e.g. running one of these:

		git config push.default matching
		git config push.default simple (or current)

and it may make it clearer what choices are suggested. The only reason I made it three lines is "(or current)" would make it harder for people who want "current only" but runs older version of git in the same repository to cut and paste.