Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes:
> The behavior of diff_populate_filespec() currently can be customized
> through a bitflag, but a subsequent patch requires it to support a
> non-boolean option. Replace the bitflag with an options struct.
Hmph, clever :-).
> + struct diff_populate_filespec_options dpf_options = {
> + .check_size_only = 1,
> + };
I would have called this instance of d-p-f-o "check_size_only",
which would make the site that uses it ...
> if (!DIFF_FILE_VALID(one))
> return 0;
> - diff_populate_filespec(r, one, CHECK_SIZE_ONLY);
> + diff_populate_filespec(r, one, &dpf_options);
... easier to understand, especially if we can made it constant, but
that would probably contradict the plan to add more fields to the
structure, so let's see how it goes.
> @@ -3339,13 +3346,17 @@ static void emit_binary_diff(struct diff_options *o,
> int diff_filespec_is_binary(struct repository *r,
> struct diff_filespec *one)
> {
> + struct diff_populate_filespec_options dpf_options = {
> + .check_binary = 1,
> + };
> +
The same comment applies to here, too.
