Thread (26 messages) 26 messages, 3 authors, 2023-09-21

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

flat view

From: Kristoffer Haugsbakk <hidden>
Date: 2023-09-04 17:14:02

Hi Dscho

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

On Fri, 1 Sep 2023, Kristoffer Haugsbakk wrote:
quoted
[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.
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help