Re: [PATCH 1/2] commit-template: remove outdated notice about explicit paths
From: Junio C Hamano <hidden>
Date: 2017-06-29 17:56:39
Possibly related (same subject, not in this thread)
- 2017-07-09 · Re: [PATCH 1/2] commit-template: remove outdated notice about explicit paths · Junio C Hamano <hidden>
- 2017-06-29 · [PATCH 1/2] commit-template: remove outdated notice about explicit paths · Kaartic Sivaraam <hidden>
Kaartic Sivaraam [off-list ref] writes:
The notice that "git commit <paths>" default to "git commit
--only <paths>" was there since 756e3ee0 ("Merge branch
'jc/commit'", 2006-02-14). Back then, existing users of Git
expected the command doing "git commit --include <paths>", and
after we changed the behaviour of the command to align with
other people's "$scm commit <paths>", we added the text to help
them transition their expectations. Remove the message that now
has outlived its usefulness.
---
builtin/commit.c | 6 ------
1 file changed, 6 deletions(-)When I said "I would have ... if I were doing this", I merely meant exactly that---as I weren't doing it, I left it up to you. But you did it the way anyways, which is very nice of you ;-). Looks good. Should we consider this signed-off by you? Thanks.
quoted hunk
diff --git a/builtin/commit.c b/builtin/commit.c index 8d1cac062..64701c8f4 100644 --- a/builtin/commit.c +++ b/builtin/commit.c@@ -139,7 +139,6 @@ static enum commit_whence whence; static int sequencer_in_use; static int use_editor = 1, include_status = 1; static int show_ignored_in_status, have_option_m; -static const char *only_include_assumed; static struct strbuf message = STRBUF_INIT; static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;@@ -841,9 +840,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix, "with '%c' will be kept; you may remove them" " yourself if you want to.\n" "An empty message aborts the commit.\n"), comment_line_char); - if (only_include_assumed) - status_printf_ln(s, GIT_COLOR_NORMAL, - "%s", only_include_assumed); /* * These should never fail because they come from our own@@ -1208,8 +1204,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 && !also && !only) - only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths..."); if (!cleanup_arg || !strcmp(cleanup_arg, "default")) cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE; else if (!strcmp(cleanup_arg, "verbatim"))