commit: remove 'Clever' message for --only --amend
authorAndreas Krey <a.krey@gmx.de>
Fri, 9 Dec 2016 04:10:21 +0000 (05:10 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2016 18:52:46 +0000 (10:52 -0800)
The behavior is now documented; more importantly, rewarding the user
with a "Wow, you are clever" praise afterwards is not an effective
way to advertise the feature--at that point the user already knows.

Signed-off-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/commit.c
index 58b799c10fb242c361f73a1eb588d264b13b222d..fc3655ae4c3f8cdc8425650739288b6bd9d98f09 100644 (file)
@@ -1203,8 +1203,6 @@ static int parse_and_validate_options(int argc, const char *argv[],
                die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
        if (argc == 0 && (also || (only && !amend && !allow_empty)))
                die(_("No paths with --include/--only does not make sense."));
-       if (argc == 0 && only && amend)
-               only_include_assumed = _("Clever... amending the last one with dirty index.");
        if (argc > 0 && !also && !only)
                only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths...");
        if (!cleanup_arg || !strcmp(cleanup_arg, "default"))