From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
To: "Eric Sunshine" <sunshine@sunshineco.com>
Cc: "Andrew Kreimer" <algonell@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] Documentation/config: fix typos
Date: Mon, 25 Nov 2024 21:20:57 +0100 [thread overview]
Message-ID: <9ab524df-bfe0-4c9a-a5e0-d07b955dbfe6@app.fastmail.com> (raw)
In-Reply-To: <7944f06f-33d9-4988-85ab-c1cf563615f3@app.fastmail.com>
On Mon, Sep 23, 2024, at 21:13, Kristoffer Haugsbakk wrote:
> On Mon, Sep 23, 2024, at 21:05, Eric Sunshine wrote:
>> [...]
>>
>> An interdiff is just a plain diff. If you have branch (or tag) "v1"
>> which is the original version of a patch series, and "v2" which is the
>> reroll of the series, then interdiff is simply:
>>
>> git diff v1 v2
>>
>> Thus, it shows the difference between the final state of the code at
>> v1 and the state at v2. Interdiffs are easy to read because they are
>> just diffs. However, because they are only showing differences in file
>> content, they don't show changes to commit messages or new or removed
>> or reordered patches in a series.
>>
>> A range-diff is a diff-of-diffs. It is very, very roughly similar to this:
>>
>> git format-patch -o v1-patches <common-base>..v1
>> git format-patch -o v2-patches <common-base>..v2
>> some-diff-dir-command v1-patches v2-patches
>>
>> It shows the diff of the patches themselves, including changes to
>> commit messages and changes to changes, as well as inserted and
>> removed and reordered patches.
>>
>> Range-diffs tend to be a good deal more difficult to read (at least at
>> first) but help show the evolution of the _patch series_ itself
>> between versions, whereas interdiffs show only the evolution of the
>> _code_ between versions. As a reviewer, if you're primarily interested
>> in how the code evolved, then interdiffs are much more easily
>> digested, but most reviewers are also interested in the holistic
>> aspects of a patch series for which range-diffs are more helpful. I
>> periodically include both range-diff and interdiffs in my rerolls.
>
> Thanks for that. I love when a good range-diff falls out of a
> reroll—and I love the tool—but of course that can’t be expected out of
> every reroll.
I guess I shouldn’t be surprised. But interdiff turned out to be really
useful. Minor rerolls are really easy to read. Such a pleasure to get
a quick sanity check before sending out a new round.
And then I also get to use range-diff at the same time—the cherry on top.
--
Kristoffer Haugsbakk
prev parent reply other threads:[~2024-11-25 20:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-23 11:03 [PATCH v2 1/2] Documentation/config: fix typos Andrew Kreimer
2024-09-23 11:03 ` [PATCH v2 2/2] Documentation: " Andrew Kreimer
2024-09-23 17:51 ` [PATCH v2 1/2] Documentation/config: " Eric Sunshine
2024-09-23 17:59 ` Eric Sunshine
2024-09-23 20:01 ` Andrew Kreimer
2024-09-23 18:43 ` Kristoffer Haugsbakk
2024-09-23 19:05 ` Eric Sunshine
2024-09-23 19:13 ` Kristoffer Haugsbakk
2024-11-25 20:20 ` Kristoffer Haugsbakk [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9ab524df-bfe0-4c9a-a5e0-d07b955dbfe6@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail.com \
--cc=algonell@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).