diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:15 -0700 |
| commit | af543833d4e10163af8045859cc081969fa5fcec (patch) | |
| tree | 8d131837c007202fa2e733996c8b5384fe73bde5 /parse-options.c | |
| parent | fbca6911dedd58136d27bff452c3ccdf48c82779 (diff) | |
| parent | af1032edf951b4f0f0b3811af4e34e26198a9ef8 (diff) | |
| download | git-af543833d4e10163af8045859cc081969fa5fcec.tar.gz | |
Merge branch 'jc/parse-options-boolean'
* jc/parse-options-boolean:
apply: use OPT_NOOP_NOARG
revert: use OPT_NOOP_NOARG
parseopt: add OPT_NOOP_NOARG
archive.c: use OPT_BOOL()
parse-options: deprecate OPT_BOOLEAN
Conflicts:
builtin/revert.c
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-options.c b/parse-options.c index 503ab5d500..f0098eb8ea 100644 --- a/parse-options.c +++ b/parse-options.c @@ -83,7 +83,7 @@ static int get_value(struct parse_opt_ctx_t *p, *(int *)opt->value &= ~opt->defval; return 0; - case OPTION_BOOLEAN: + case OPTION_COUNTUP: *(int *)opt->value = unset ? 0 : *(int *)opt->value + 1; return 0; @@ -319,7 +319,7 @@ static void parse_options_check(const struct option *opts) err |= optbug(opts, "uses feature " "not supported for dashless options"); switch (opts->type) { - case OPTION_BOOLEAN: + case OPTION_COUNTUP: case OPTION_BIT: case OPTION_NEGBIT: case OPTION_SET_INT: |