[PATCH] commit: remove 'Clever' message for --only --amend
- From
Andreas Krey <a.krey@gmx.de>
- Date
- Dec 9, 2016, 04:10 UTC
- Message-ID
- <20161209041021.GB16292@inner.h.apk.li>
- In-Reply-To
- <xmqq1sxiv051.fsf@gitster.mtv.corp.google.com>
That behavior is now documented, and we don't need a reward afterwards.
Signed-off-by: Andreas Krey <a.krey@gmx.de> ---
> Sorry for making you send an extra round; let's queue the original, > and if you still are interested, have the "Clever" removal as its > own patch.
Here you go.
builtin/commit.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c index 89b66816f..276c74034 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1208,8 +1208,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"))
-- 2.11.0.10.g1e1b186.dirty