[PATCH] reset: Better warning message on git reset --mixed <paths>
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 14, 2010, 19:34 UTC
- Message-ID
- <1281814499-11797-1-git-send-email-avarab@gmail.com>
When you call "git reset --mixed <paths>" git will complain that using mixed with paths is deprecated:
warning: --mixed option is deprecated with paths.
That doesn't tell the user why it's deprecated, or what he should use instead. Expand on the warning and tell the user to just omit --mixed:
warning: --mixed is redundant with paths, use 'git reset <paths>' instead.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> ---
On Sat, Aug 14, 2010 at 19:12, Ralf Ebert <info@ralfebert.de> wrote:
Show 18 quoted lines
> On 14.08.2010 20:55, Ævar Arnfjörð Bjarmason wrote: >> >> On Sat, Aug 14, 2010 at 18:40, Ralf Ebert<info@ralfebert.de> wrote: >>> >>> On 14.08.2010 17:23, Ævar Arnfjörð Bjarmason wrote: >>>> >>>> So what should I use instead? 0e5a7faa which introduced it doesn't say. >>> >>> It doesn't currently exist, but I'm pretty sure it should be called 'git >>> unstage' :) >> >> Then perhaps it should be undeprecated? If what you say is correct >> it's been whining about that since 2007 with no alternative, while >> doing what I mean when I run it. > > Sorry, I misremembered '--mixed' again, '--mixed' is the default and it > doesn't complain if you just omit it, and if I read&tried right, 'git reset > <file>' does the same as 'git reset --mixed <file>'.
Right you are, if only we had a manpage to explain this or something >:)
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.
builtin/reset.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/reset.c b/builtin/reset.c index 1283068..a7878d4 100644 --- a/builtin/reset.c +++ 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."); else if (reset_type != NONE) die("Cannot do %s reset with paths.", reset_type_names[reset_type]);
-- 1.7.2.1.339.g9c5d4