diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:39:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:39:03 -0700 |
| commit | a86a8b9752d5abb7d0e6cd69017170e826d41fb5 (patch) | |
| tree | 82c43449ca57a50066eb342ab1610c0539eb58aa /builtin/clean.c | |
| parent | 366b80bf0a84b607115bd4ffcd8e5ebfc7338442 (diff) | |
| parent | 84d83f642a680f72f8e81313d605e61bf9efa38f (diff) | |
| download | git-a86a8b9752d5abb7d0e6cd69017170e826d41fb5.tar.gz git-a86a8b9752d5abb7d0e6cd69017170e826d41fb5.tar.xz | |
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/clean.c')
| -rw-r--r-- | builtin/clean.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 3c85e152e..4b6fd42be 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -875,12 +875,12 @@ int cmd_clean(int argc, const char **argv, const char *prefix) OPT__DRY_RUN(&dry_run, N_("dry run")), OPT__FORCE(&force, N_("force")), OPT_BOOL('i', "interactive", &interactive, N_("interactive cleaning")), - OPT_BOOLEAN('d', NULL, &remove_directories, + OPT_BOOL('d', NULL, &remove_directories, N_("remove whole directories")), { OPTION_CALLBACK, 'e', "exclude", &exclude_list, N_("pattern"), N_("add <pattern> to ignore rules"), PARSE_OPT_NONEG, exclude_cb }, - OPT_BOOLEAN('x', NULL, &ignored, N_("remove ignored files, too")), - OPT_BOOLEAN('X', NULL, &ignored_only, + OPT_BOOL('x', NULL, &ignored, N_("remove ignored files, too")), + OPT_BOOL('X', NULL, &ignored_only, N_("remove only ignored files")), OPT_END() }; |