[PATCH v3 37/42] completion: use __gitcomp_builtin in _git_rm
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2018-02-09 11:05:58
Subsystem:
the rest · Maintainer:
Linus Torvalds
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/rm.c | 2 +- contrib/completion/git-completion.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rm.c b/builtin/rm.c
index 6e0c7f5ac6..a818efe230 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c@@ -242,7 +242,7 @@ static struct option builtin_rm_options[] = { OPT__DRY_RUN(&show_only, N_("dry run")), OPT__QUIET(&quiet, N_("do not list removed files")), OPT_BOOL( 0 , "cached", &index_only, N_("only remove from the index")), - OPT__FORCE(&force, N_("override the up-to-date check"), 0), + OPT__FORCE(&force, N_("override the up-to-date check"), PARSE_OPT_NOCOMPLETE), OPT_BOOL('r', NULL, &recursive, N_("allow recursive removal")), OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch, N_("exit with a zero status even if nothing matched")),
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e63f2f2741..30a51c5015 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash@@ -2715,7 +2715,7 @@ _git_rm () { case "$cur" in --*) - __gitcomp "--cached --dry-run --ignore-unmatch --quiet" + __gitcomp_builtin rm return ;; esac
--
2.16.1.207.gedba492059