diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2013-08-03 13:51:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 11:32:17 -0700 |
| commit | 4741edd549decfccc016fa4775b349fe94fdf4e5 (patch) | |
| tree | fc5bfb57bf7065e7ca918dc45265840f54c7c18c /builtin/checkout.c | |
| parent | e6b722db099f435f21ce72b18f0d61dc3c778f1f (diff) | |
| download | git-4741edd549decfccc016fa4775b349fe94fdf4e5.tar.gz git-4741edd549decfccc016fa4775b349fe94fdf4e5.tar.xz | |
Remove deprecated OPTION_BOOLEAN for parsing arguments
As of b04ba2bb4 OPTION_BOOLEAN was deprecated.
This commit removes all occurrences of OPTION_BOOLEAN.
In b04ba2bb4 Junio suggested to replace it with either
OPTION_SET_INT or OPTION_COUNTUP instead. However a pattern, which
occurred often with the OPTION_BOOLEAN was a hidden boolean parameter.
So I defined OPT_HIDDEN_BOOL as an additional possible parse option
in parse-options.h to make life easy.
The OPT_HIDDEN_BOOL was used in checkout, clone, commit, show-ref.
The only exception, where there was need to fiddle with OPTION_SET_INT
was log and notes. However in these two files there is also a pattern,
so we could think of introducing OPT_NONEG_BOOL.
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 7025938ae..646a4757b 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1073,9 +1073,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) OPT_BOOLEAN('p', "patch", &opts.patch_mode, N_("select hunks interactively")), OPT_BOOL(0, "ignore-skip-worktree-bits", &opts.ignore_skipworktree, N_("do not limit pathspecs to sparse entries only")), - { OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL, - N_("second guess 'git checkout no-such-branch'"), - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN }, + OPT_HIDDEN_BOOL(0, "guess", &dwim_new_local_branch, + N_("second guess 'git checkout no-such-branch'")), OPT_END(), }; |