diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 23:39:02 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 23:39:03 +0400 |
commit | a86a8b9752d5abb7d0e6cd69017170e826d41fb5 (patch) | |
tree | 82c43449ca57a50066eb342ab1610c0539eb58aa /builtin/rm.c | |
parent | 366b80bf0a84b607115bd4ffcd8e5ebfc7338442 (diff) | |
parent | 84d83f642a680f72f8e81313d605e61bf9efa38f (diff) |
Merge branch 'sb/parseopt-boolean-removal'
Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary.
* sb/parseopt-boolean-removal:
revert: use the OPT_CMDMODE for parsing, reducing code
checkout-index: fix negations of even numbers of -n
config parsing options: allow one flag multiple times
hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
branch, commit, name-rev: ease up boolean conditions
checkout: remove superfluous local variable
log, format-patch: parsing uses OPT__QUIET
Replace deprecated OPT_BOOLEAN by OPT_BOOL
Remove deprecated OPTION_BOOLEAN for parsing arguments
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 d00eaf86d5..18bf218999 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -267,10 +267,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(), }; |