diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2013-08-03 15:51:19 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 22:32:19 +0400 |
| commit | d5d09d475440c24016ec52a0bcc8477d9a7b5c71 (patch) | |
| tree | a6758a688f3308d4dc4ff75885fe7ce8792c9921 /builtin/rm.c | |
| parent | 4741edd549decfccc016fa4775b349fe94fdf4e5 (diff) | |
Replace deprecated OPT_BOOLEAN by OPT_BOOL
This task emerged from b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
2011-09-27). All occurrences of the respective variables have
been reviewed and none of them relied on the counting up mechanism,
but all of them were using the variable as a true boolean.
This patch does not change semantics of any command intentionally.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 18916e022a..ce28fa9ac9 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -268,10 +268,10 @@ static int ignore_unmatch = 0; static struct option builtin_rm_options[] = { OPT__DRY_RUN(&show_only, N_("dry run")), OPT__QUIET(&quiet, N_("do not list removed files")), - OPT_BOOLEAN( 0 , "cached", &index_only, N_("only remove from the index")), + OPT_BOOL( 0 , "cached", &index_only, N_("only remove from the index")), OPT__FORCE(&force, N_("override the up-to-date check")), - OPT_BOOLEAN('r', NULL, &recursive, N_("allow recursive removal")), - OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch, + 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")), OPT_END(), }; |