summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-02-09 11:02:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-09 18:24:53 (GMT)
commit44c9a6d2699134d19d5b78503633615fe1bdfa31 (patch)
tree0ce4f6f323068d3b2c40aa29aa690f2e335caeb7
parente5f985187393180f072f0745c1f119fb1af128db (diff)
downloadgit-44c9a6d2699134d19d5b78503633615fe1bdfa31.zip
git-44c9a6d2699134d19d5b78503633615fe1bdfa31.tar.gz
git-44c9a6d2699134d19d5b78503633615fe1bdfa31.tar.bz2
completion: use __gitcomp_builtin in _git_rm
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/rm.c2
-rw-r--r--contrib/completion/git-completion.bash2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rm.c b/builtin/rm.c
index 6e0c7f5..a818efe 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 e63f2f2..30a51c5 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