Re: [PATCH v2] pull: warn if the user didn't say whether to rebase or to merge

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 29, 2020, 16:51 UTC
Message-ID: <xmqqzhd1balh.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20200229010927.335119-1-alexhenrie24@gmail.com>

Alex Henrie <alexhenrie24@gmail.com> writes:

> +		warning(_("Pulling without specifying whether to rebase or to merge is discouraged\n"
> +			"and will be disallowed in a future Git release.\n"

Sorry for not catching this in the earlier round, but I do not think anybody argued, let alone the community came to a concensus on doing, such a strong move. Am I mistaken?

I certainly did not intend to, at least when I commented on the earlier round and proposed an updated log message, I wasn't even aware of the possibility that we may want to turn this into die() after a transition period.

Not that I'd object strongly to the idea, but it was somewhat unexpected.

If we are proposing to make it a long-term plan, that should certainly be written down in the proposed log message.

> +			"Next time, run `git config pull.rebase (true|false)` first\n"
> +			"or pass --rebase, --no-rebase, or --ff-only on the command line.\n

I am somewhat puzzled by "first, or". You certainly mean the config to be "set and forget", and you do not want to say "before you pull, do this first, always", but somehow the latter is the impression I got.

But it does not sound to me like "Next time, and only next time, do
this configuration.  You can countermand the choice you make from
the command line later if needed", which I think is what you meant
to convey to your readers.
 
    You can squelch this message by `pull.rebase` configuration
    variable to show your preference.  By passing --[no-]rebase
    or --ff-only from the command line, you can countermand the
    choice per invocation.

is what I came up with, but I am not quite happy with it. It is overly long to start with X-<.

"));

> +	}
> +
>  	return REBASE_FALSE;
>  }