[PATCH 3/4] OPT__DRY_RUN(): use OPT_BOOL, not OPT_BOOLEAN
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 6, 2013, 23:31 UTC
- Message-ID
- <1375831889-9610-4-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1375831889-9610-1-git-send-email-gitster@pobox.com>
There cannot be "git cmd -n -n" that behaves even less drier than "git cmd -n", and no existing users of the macro implements such a semantics (a summary of the audit at the end).
Instead of OPT_BOOLEAN, use OPT_BOOL to clarify.
builtin/add.c:
uses "show_only" as a bool.
builtin/clean.c:
uses "dry_run" as a bool, and passes it to the parameter with the same name of remove_dirs(), which is also used as a bool.
builtin/mv.c:
uses "show_only" as a bool.
builtin/notes.c:
uses "show_only" as a bool.
builtin/prune.c:
uses "show_only" as a bool (including its use as a bool to decide use of PRUNE_PACKED_DRY_RUN as a parameter to prune_packed_objects()).
builtin/read-tree.c:
opts.dry_run is used as a bool, in this file and also in unpack_trees() that is called from here.
builtin/remote.c:
dry_run is passed to prune_remote() and used as a bool.
builtin/rm.c:
show_only is used as a bool.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- parse-options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parse-options.h b/parse-options.h index 582dd4b..78f52c2 100644 --- a/parse-options.h +++ b/parse-options.h @@ -237,7 +237,7 @@ extern int parse_opt_noop_cb(const struct option *, const char *, int); PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 }, \ { OPTION_CALLBACK, 'q', "quiet", (var), NULL, N_("be more quiet"), \ PARSE_OPT_NOARG, &parse_opt_verbosity_cb, 0 } -#define OPT__DRY_RUN(var, h) OPT_BOOLEAN('n', "dry-run", (var), (h)) +#define OPT__DRY_RUN(var, h) OPT_BOOL('n', "dry-run", (var), (h)) #define OPT__FORCE(var, h) OPT_BOOLEAN('f', "force", (var), (h)) #define OPT__ABBREV(var) \ { OPTION_CALLBACK, 0, "abbrev", (var), N_("n"), \
-- 1.8.4-rc1-210-gf6d87e2