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
This commit is contained in:
@ -346,9 +346,9 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
|
||||
NULL
|
||||
};
|
||||
static struct option parseopt_opts[] = {
|
||||
OPT_BOOLEAN(0, "keep-dashdash", &keep_dashdash,
|
||||
OPT_BOOL(0, "keep-dashdash", &keep_dashdash,
|
||||
N_("keep the `--` passed as an arg")),
|
||||
OPT_BOOLEAN(0, "stop-at-non-option", &stop_at_non_option,
|
||||
OPT_BOOL(0, "stop-at-non-option", &stop_at_non_option,
|
||||
N_("stop parsing after the "
|
||||
"first non-option argument")),
|
||||
OPT_END(),
|
||||
|
Reference in New Issue
Block a user