Re: [PATCH v4 05/21] range-diff: also show the diff between patches

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Aug 10, 2018, 21:31 UTC
Message-ID: <CAPig+cQ9DcFPosPcjo6MbF_sF9DXuZQ_gZe5jxyx0vbH932sdA@mail.gmail.com>
In-Reply-To: <nycvar.QRO.7.76.6.1808102308140.71@tvgsbejvaqbjf.bet>

On Fri, Aug 10, 2018 at 5:12 PM Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 11 quoted lines

> On Mon, 30 Jul 2018, Eric Sunshine wrote:
> > I think you can attain the desired behavior by making a final
> > parse_options() call with empty 'options' list after the call to
> > diff_setup_done(). It's pretty much a one-line fix, but can probably
> > be done as an incremental change rather than rerolling.
>
> But then we would have to keep `--` in the first, and not in the second
> parse_options() call, right? We would also have to handle that `--`
> properly in the loop that calls diff_opt_parse(), I think.
> A bit more involved than just a one-line fix, but I guess I'll give it a
> try.

It's something that could easily wait until after this series lands. After all, it's just a slightly confusing error message, not some fundamental problem.

As for '--', I'll have to go back and look at the code. I thought I had thought it all through at the time I made the suggestion, but my brain needs a refresh by now.