summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:57 +0900
committerJunio C Hamano <gitster@pobox.com>2019-03-07 09:59:58 +0900
commitb0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 (patch)
treed07202c20257da961faf1f9a2d4852371c0289ca /builtin/commit.c
parent4751a1673c7d4aeb1b6462f89fa7d86c05898d05 (diff)
parent5a59a2301f6ec9bcf1b101edb9ca33beb465842f (diff)
Merge branch 'nd/completion-more-parameters'
The command line completion (in contrib/) has been taught to complete more subcommand parameters. * nd/completion-more-parameters: completion: add more parameter value completion
Diffstat (limited to 'builtin/commit.c')
-rw-r--r--builtin/commit.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 8d7a613fda..f17537474a 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1039,6 +1039,10 @@ static void handle_untracked_files_arg(struct wt_status *s)
s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
else if (!strcmp(untracked_files_arg, "all"))
s->show_untracked_files = SHOW_ALL_UNTRACKED_FILES;
+ /*
+ * Please update $__git_untracked_file_modes in
+ * git-completion.bash when you add new options
+ */
else
die(_("Invalid untracked files mode '%s'"), untracked_files_arg);
}
@@ -1180,6 +1184,10 @@ static int parse_and_validate_options(int argc, const char *argv[],
else if (!strcmp(cleanup_arg, "scissors"))
cleanup_mode = use_editor ? COMMIT_MSG_CLEANUP_SCISSORS :
COMMIT_MSG_CLEANUP_SPACE;
+ /*
+ * Please update _git_commit() in git-completion.bash when you
+ * add new options.
+ */
else
die(_("Invalid cleanup mode %s"), cleanup_arg);