Re: [PATCH v3] range-diff: add --matched-only to skip one-sided commits
- From
Harald Nordgren <haraldnordgren@gmail.com>
- Date
- Nov 2, 2026, 21:15 UTC
- Message-ID
- <CAHwyqnWPhgT54M2LL7SxSm0qufSaYDD-gGAJVTdOqaKy-CTA-A@mail.gmail.com>
- In-Reply-To
- <CAHwyqnVbgHOvCbXjWAuV7CkXranyBAocfobH8Jerf_96iWzYkA@mail.gmail.com>
Well, in this particular case `--left-only` solves it.
So maybe that's enough.
Harald
On Mon, Nov 2, 2026 at 10:03 PM Harald Nordgren <haraldnordgren@gmail.com> wrote:
Show 137 quoted lines
>
> On Mon, Nov 2, 2026 at 5:47 PM Ben Knoble <ben.knoble@gmail.com> wrote:
> >
> >
> > > Le 2 nov. 2026 à 05:11, Harald Nordgren <haraldnordgren@gmail.com> a écrit :
> > >
> > > On Mon, Nov 2, 2026 at 10:21 AM Junio C Hamano <gitster@pobox.com> wrote:
> > >>
> > >> "Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:
> > >>
> > >>> From: Harald Nordgren <haraldnordgren@gmail.com>
> > >>>
> > >>> Reviewing a range-diff often means scrolling past commits that were
> > >>> simply added or dropped, when only the ones that correspond between
> > >>> the two ranges are of interest.
> > >>>
> > >>> --left-only and --right-only already each suppress one of those
> > >>> one-sided groups, but they are defined as "only show this side" and
> > >>> so cannot be given together, which is exactly why show_range_diff()
> > >>> already rejected that combination. Give the "show only the commits
> > >>> that correspond on both sides" behavior its own name, --matched-only,
> > >>> instead of asking users to reach for a combination that errors out.
> > >>>
> > >>> Extend the existing '--left-only'/'--right-only' conflict check to
> > >>> also reject any combination with --matched-only, since all three
> > >>> narrow the output in ways that cannot be combined.
> > >>>
> > >>> Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
> > >>> ---
> > >>> range-diff: add --matched-only to skip one-sided commits
> > >>>
> > >>> Add git range-diff --matched-only to only show commits that correspond
> > >>> between the two ranges, skipping ones that were only added or only
> > >>> removed.
> > >>>
> > >>> Changes in v2:
> > >>>
> > >>> * Update docs and commit message.
> > >>> * Use die_for_incompatible_opt3.
> > >>
> > >> This is more than 6 weeks old and looking at the archive, nobody
> > >> (including me) was really interested in the topic. Anybody wants to
> > >> take a fresh look at the topic?
> > >>
> > >> Unless we see some volunteers to give it a review in a few weeks, I
> > >> will discard the topic out of my tree, as 'seen' has been crowded
> > >> with topics that have been collecting dust without getting many
> > >> reviews.
> > >
> > > That's a bit sad. I wonder if no one is commenting on it because the
> > > code is too trivial, meaning nothing that stands out to comment on.
> > > All it does is allow left_only and right_only to run at the same time,
> > > and the majority of the new code is tests.
> > >
> > >
> > > Harald
> >
> > I just skimmed the v3 message, and I’m missing the motivation.
> > When looking at a range-diff, why would I want to hide the added/deleted
> > commits?
> >
> > I suppose when rebasing, I might want to not show the dropped
> > fixup commits or something in a range-diff of @{1}…, but
> > I’m having a hard time coming up with another use case.
> >
> > Doesn’t mean there aren’t any! [But the patch might get more
> > and better reviews if it is well motivated?] Anyway, I’d be curious
> > to learn what motivated Harald, as it might be useful to my
> > own workflows, in which case I might be able to review more.
>
> For me, it's simple:
>
> If we take this branch, and I do some other changes, and then rebase
> against the latest master. Then when I run
>
> git range-diff
> pr-git-2401/HaraldNordgren/range-diff-matched-only-v3...range-diff-matched-only
>
> I will have to scroll through 311 unrelated commits before I can see
> what I actually changed. I want those gone.
>
> ```
> -: ---------- > 282: b2608c4076 t2104: avoid suppressing git's exit code
> -: ---------- > 283: 5e106cb22b pack-write: make index-pack output
> comment hash agnostic
> -: ---------- > 284: 21bb64feef pack-write: lift and expose
> index-pack report parsing
> -: ---------- > 285: dfb7f49776 object-file: explicitly write
> ".keep" lockfile
> -: ---------- > 286: b07099fff9 object-file: write ".keep"
> lockfiles during transaction commit
> -: ---------- > 287: 91ef176b8f branch: strip refs/heads/ from the
> --set-upstream-to hint
> -: ---------- > 288: 8f3d6ad89f checkout: use Q_() for messages with counts
> -: ---------- > 289: 7e34d8174d The 8th batch
> -: ---------- > 290: 4ec5266711 branch: return an error from
> setup_tracking()
> -: ---------- > 291: ad74e02417 checkout: finish switching when
> the tracking config cannot be written
> -: ---------- > 292: d84678b8cf Documentation: describe
> connectivity checking
> -: ---------- > 293: 97998dcfd1 p5413: add perf tests for connectivity check
> -: ---------- > 294: d6d2d8557c connected: drop dependency on
> `the_repository`
> -: ---------- > 295: 9e0207b50b connected: add
> transfer.connectivityCheck config
> -: ---------- > 296: 43157175b5 connected: add incremental
> connectivity check via rev-list
> -: ---------- > 297: 656be5948a connected: add "auto" connectivity
> check mode
> -: ---------- > 298: 9dba0b87e5 rerere: stop using
> `the_repository` in `rerere_path()`
> -: ---------- > 299: f62947adf0 rerere: stop using
> `the_repository` in internal helpers
> -: ---------- > 300: a8b75e8eda rerere: remove redundant calls to
> `repo_config()`
> -: ---------- > 301: 87ab289605 rerere: cache result of
> `is_rerere_enabled()`
> -: ---------- > 302: 4f67f74fc8 rerere: stop using `the_repository`
> -: ---------- > 303: ea54cda7c2 rerere: bundle global state into a struct
> -: ---------- > 304: b948c10c8b rerere: get rid of global rerere cache state
> -: ---------- > 305: c3764d15e6 hook: make hook.<event>.enabled
> cover the hookdir hook
> -: ---------- > 306: 3a7784d0d5 hook: accept .enabled and
> .parallel given without a value
> -: ---------- > 307: 37b3475fb5 The 9th batch
> -: ---------- > 308: 8d1b215c01 The 10th batch
> -: ---------- > 309: b9e5cff180 The 11th batch
> -: ---------- > 310: 50fe5cc63f The 12th batch
> -: ---------- > 311: ebdc087dc9 The 13th batch
> 1: ee195c14fc = 312: f01d7e30ef range-diff: add --matched-only to
> skip one-sided commits
> ```
>
>
>
> Harald