Re: [PATCH v2 1/3] range-diff: treat notes like `log`

From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Date: Sep 4, 2023, 17:10 UTC
Message-ID: <8642763e-d3e7-49c4-b2ea-d5e4bebfbca5@app.fastmail.com>
In-Reply-To: <94b9535b-8c2a-eb8f-90fb-cd0f998ec57e@gmx.de>

Hi Dscho

On Sun, Sep 3, 2023, at 14:17, Johannes Schindelin wrote:

Show 14 quoted lines

> Hi Kristoffer,
>
> On Fri, 1 Sep 2023, Kristoffer Haugsbakk wrote:
>
> > [snip]
>
> Very well explained.
>
> The root cause for this is 8cf51561d1e (range-diff: fix a crash in parsing
> git-log output, 2020-04-15) which added the `--notes` argument in
> `read_patches()`' call. The commit message explains why this is needed:
> the (necessary) `--pretty=medium` would turn off the notes, therefore
> `--notes` had to be added to reinstate the original behavior (except, as
> you pointed out, in the case `--notes=<ref>` was specified).

That's interesting. I didn't find that commit in my history spelunking.

Show 10 quoted lines

>> Remedy this by co-opting the `--standard-notes` option which has been
>> deprecated since ab18b2c0df[2] and which is currently only documented in
>> `pretty-options`.
>
> This sounds a bit less desirable, though, than passing the `--notes`
> argument only as needed. This patch (on top of `notes-range-diff` in your
> fork) lets the new test still pass while leaving `--standard-notes`
> deprecated:
>
> [snip]

I like it. I didn't like my solution but it was the only thing that I could get to work. I would like to use your solution instead. Thank you.

Maybe you could supply a commit message for v3? v3 would then consist of two commits:

1. Your fix
2. Those two tests

Or should it be handled in some other way?

Cheers

-- 
Kristoffer Haugsbakk