Re: [PATCH 4/6] range-diff: combine all options in a single data structure
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 5, 2021, 14:13 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2102051513050.54@tvgsbejvaqbjf.bet>
- In-Reply-To
- <CAPig+cSNCVT8h-wFBGvDWB4u0OUQM-Q-1DwuLepnjTdwEpk_4A@mail.gmail.com>
Hi Eric,
On Thu, 4 Feb 2021, Eric Sunshine wrote:
Show 29 quoted lines
> On Thu, Feb 4, 2021 at 3:24 PM Johannes Schindelin via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> > This will make it easier to implement the `--left-only` and
> > `--right-only` options.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > diff --git a/range-diff.h b/range-diff.h
> > @@ -6,15 +6,20 @@
> > +struct range_diff_options {
> > + int creation_factor;
> > + unsigned dual_color:1;
> > + const struct diff_options *diffopt;
> > + const struct strvec *other_arg;
> > +};
> > +
> > /*
> > * Compare series of commits in RANGE1 and RANGE2, and emit to the
> > * standard output. NULL can be passed to DIFFOPT to use the built-in
> > * default.
> > */
> > int show_range_diff(const char *range1, const char *range2,
> > - int creation_factor, int dual_color,
> > - const struct diff_options *diffopt,
> > - const struct strvec *other_arg);
> > + struct range_diff_options *opts);
>
> The function comment's mention of DIFFOPT becomes outdated with this
> change. Perhaps update it to say `opts.diffopt` or something.I actually moved the comment to the new `struct`.
Thanks, Dscho