Elijah Newren <new...@gmail.com> writes:
> There are lots of options that callers can set, yet most have a limited
> range of valid values, some options are meant for output (e.g.
> opt->obuf, which is expected to start empty), and callers are expected
> to not set opt->priv. Add several sanity checks to ensure callers
> provide sane values.
> ...
The change to the struct does not seem to have much with the above
rationale.
> diff --git a/merge-recursive.h b/merge-recursive.h
> index 978847e672..d201ee80fb 100644
> --- a/merge-recursive.h
> +++ b/merge-recursive.h
> @@ -27,7 +27,7 @@ struct merge_options {
> } detect_directory_renames;
> int rename_limit;
> int rename_score;
> - int show_rename_progress;
> + int show_rename_progress : 1;
And a one-bit wide bitfield that is signed is always an iffy idea.
>
> /* xdiff-related options (patience, ignore whitespace, ours/theirs) */
> long xdl_opts;
