Re: [PATCH] reset: Better warning message on git reset --mixed <paths>

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Aug 14, 2010, 21:05 UTC
Message-ID: <20100814210505.GA2372@burratino>
In-Reply-To: <1281814499-11797-1-git-send-email-avarab@gmail.com>

Ævar Arnfjörð Bjarmason wrote:

> Anyway, I think the warning could be better, here's a patch to
> implement that. We could also warn on a plain "git reset --mixed"
> since it's also redundant, but that would be adding something new so I
> haven't done that here.

That seems backwards --- it is not actually the redundancy that leads to this warning (and I hope we never add such a warning to save people typing).

Instead, I had assumed the idea was that some day “git reset --mixed <path>” will be forbidden, eliminating a potential ambiguity in that argument and saving high-level scripts from needing -- at the end of “git reset --mixed <rev> --”.

Show 7 quoted lines

> +++ b/builtin/reset.c
> @@ -318,7 +318,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
>  	 * affecting the working tree nor HEAD. */
>  	if (i < argc) {
>  		if (reset_type == MIXED)
> -			warning("--mixed option is deprecated with paths.");
> +			warning("--mixed is redundant with paths, use 'git reset <paths>' instead.");

Maybe:

 warning: --mixed with paths is deprecated; use 'git reset -- <paths>' instead