Stefan Beller <[email protected]> writes:
> All occurrences of OPT_SET_INT were setting the value to 1;
> internally OPT_BOOL is just that.
>
> Signed-off-by: Stefan Beller <[email protected]>
> ---
> builtin/read-tree.c | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
The result is much easier to read, partly because the "1" (true) is
at the very end of the line when OPT_SET_INT() is used for the
reader to notice that this is merely a boolean.
More importantly, as OPT_SET_INT() can be used multiple times on the
same variable (or field) to set it to different values, it is easier
to read if OPT_BOOL() is used when OPT_SET_INT() to 1 is not used
for that purpose.
Thanks.
>> diff --git a/builtin/read-tree.c b/builtin/read-tree.c
> index fa6edb35b2..8ba64bc785 100644
> --- a/builtin/read-tree.c
> +++ b/builtin/read-tree.c
> @@ -109,34 +109,34 @@ int cmd_read_tree(int argc, const char **argv, const
> char *unused_prefix)
> { OPTION_CALLBACK, 0, "index-output", NULL, N_("file"),
> N_("write resulting index to <file>"),
> PARSE_OPT_NONEG, index_output_cb },
> - OPT_SET_INT(0, "empty", &read_empty,
> - N_("only empty the index"), 1),
> + OPT_BOOL(0, "empty", &read_empty,
> + N_("only empty the index")),
> OPT__VERBOSE(&opts.verbose_update, N_("be verbose")),
> OPT_GROUP(N_("Merging")),
> - OPT_SET_INT('m', NULL, &opts.merge,
> - N_("perform a merge in addition to a read"), 1),
> - OPT_SET_INT(0, "trivial", &opts.trivial_merges_only,
> - N_("3-way merge if no file level merging
> required"), 1),
> - OPT_SET_INT(0, "aggressive", &opts.aggressive,
> - N_("3-way merge in presence of adds and removes"),
> 1),
> - OPT_SET_INT(0, "reset", &opts.reset,
> - N_("same as -m, but discard unmerged entries"), 1),
> + OPT_BOOL('m', NULL, &opts.merge,
> + N_("perform a merge in addition to a read")),
> + OPT_BOOL(0, "trivial", &opts.trivial_merges_only,
> + N_("3-way merge if no file level merging required")),
> + OPT_BOOL(0, "aggressive", &opts.aggressive,
> + N_("3-way merge in presence of adds and removes")),
> + OPT_BOOL(0, "reset", &opts.reset,
> + N_("same as -m, but discard unmerged entries")),
> { OPTION_STRING, 0, "prefix", &opts.prefix,
> N_("<subdirectory>/"),
> N_("read the tree into the index under <subdirectory>/"),
> PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
> - OPT_SET_INT('u', NULL, &opts.update,
> - N_("update working tree with merge result"), 1),
> + OPT_BOOL('u', NULL, &opts.update,
> + N_("update working tree with merge result")),
> { OPTION_CALLBACK, 0, "exclude-per-directory", &opts,
> N_("gitignore"),
> N_("allow explicitly ignored files to be overwritten"),
> PARSE_OPT_NONEG, exclude_per_directory_cb },
> - OPT_SET_INT('i', NULL, &opts.index_only,
> - N_("don't check the working tree after merging"),
> 1),
> + OPT_BOOL('i', NULL, &opts.index_only,
> + N_("don't check the working tree after merging")),
> OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the
> work tree")),
> - OPT_SET_INT(0, "no-sparse-checkout", &opts.skip_sparse_checkout,
> - N_("skip applying sparse checkout filter"), 1),
> - OPT_SET_INT(0, "debug-unpack", &opts.debug_unpack,
> - N_("debug unpack-trees"), 1),
> + OPT_BOOL(0, "no-sparse-checkout", &opts.skip_sparse_checkout,
> + N_("skip applying sparse checkout filter")),
> + OPT_BOOL(0, "debug-unpack", &opts.debug_unpack,
> + N_("debug unpack-trees")),
> OPT_END()
> };
