From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Leon Michalak via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Christian Couder <christian.couder@gmail.com>,
Leon Michalak <leonmichalak6@gmail.com>
Subject: Re: [PATCH v3 4/4] add-patch: add diff.context command line overrides
Date: Tue, 1 Jul 2025 10:59:55 +0100 [thread overview]
Message-ID: <7686a5e0-23c3-4e3a-b5ea-3b8c80ba54fa@gmail.com> (raw)
In-Reply-To: <xmqqplel17s3.fsf@gitster.g>
On 30/06/2025 18:03, Junio C Hamano wrote:
> "Leon Michalak via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: Leon Michalak <leonmichalak6@gmail.com>
>>
>> This patch compliments the previous commit, where builtins that use
>> add-patch infrastructure now respect diff.context and
>> diff.interHunkContext file configurations.
>>
>> In particular, this patch helps users who don't want to set persistent
>> context configurations or just want a way to override them on a one-time
>> basis, by allowing the relevant builtins to accept corresponding command
>> line options that override the file configurations.
>>
>> This mimics commands such as diff and log, which allow for both context
>> file configuration and command line overrides.
>
> I skimmed the patch briefly. I am not sure if it is a good idea to
>
> * add OPT_DIFF_*() macros to parse-options API, as its utility is
> very narrow, and forces those who are learning parse-options API
> to learn one more thing.
It means that we have consistent help for all the commands with these
options which I think is valuable. We have a number of other macros that
define options that are shared between commands and I think that works
quite well.
>
> * validation of the value range to be duplicated for each and every
> users of the new OPT_DIFF_*() macros.
Yes the validation is awkward. If we changed the OPT_DIFF_* to use a
callback that rejected negative values that would reduce the duplication.
> but other than that, looked reasonable to me.
I've left a couple of comments on the tests but the code changes look
reasonable to me too
Thanks
Phillip
next prev parent reply other threads:[~2025-07-01 10:00 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-05 9:18 [PATCH 0/3] Better support for customising context lines in --patch commands Leon Michalak via GitGitGadget
2025-05-05 9:18 ` [PATCH 1/3] add-patch: respect diff.context configuration Leon Michalak via GitGitGadget
2025-05-05 20:29 ` Eric Sunshine
2025-05-06 8:55 ` Phillip Wood
2025-05-06 17:29 ` Junio C Hamano
2025-05-05 9:18 ` [PATCH 2/3] add-patch: add diff.context command line overrides Leon Michalak via GitGitGadget
2025-05-05 9:49 ` Kristoffer Haugsbakk
[not found] ` <CAP9jKjHj7WP91aKA9SE94zYj+naBGLUs99mF3G4BhTGcGjFDUQ@mail.gmail.com>
2025-05-05 10:11 ` Leon Michalak
2025-05-07 9:51 ` Phillip Wood
2025-05-07 18:07 ` Junio C Hamano
2025-05-07 18:28 ` Leon Michalak
2025-05-07 20:25 ` Junio C Hamano
2025-05-05 9:18 ` [PATCH 3/3] add-interactive: add new "context" subcommand Leon Michalak via GitGitGadget
2025-05-06 0:02 ` Eric Sunshine
2025-05-06 7:20 ` Leon Michalak
2025-05-06 8:28 ` Christian Couder
2025-05-06 17:07 ` Leon Michalak
2025-05-06 16:37 ` Junio C Hamano
2025-05-06 17:25 ` Leon Michalak
2025-05-07 13:30 ` Phillip Wood
2025-05-07 19:10 ` Junio C Hamano
2025-05-10 13:46 ` [PATCH v2 0/4] Better support for customising context lines in --patch commands Leon Michalak via GitGitGadget
2025-05-10 13:46 ` [PATCH v2 1/4] test: refactor to use "test_grep" Leon Michalak via GitGitGadget
2025-05-12 13:42 ` Junio C Hamano
2025-05-12 16:58 ` Leon Michalak
2025-05-10 13:46 ` [PATCH v2 2/4] test: refactor to use "test_config" Leon Michalak via GitGitGadget
2025-05-10 13:46 ` [PATCH v2 3/4] add-patch: respect diff.context configuration Leon Michalak via GitGitGadget
2025-05-13 13:52 ` Phillip Wood
2025-05-13 15:47 ` Junio C Hamano
2025-05-14 15:13 ` Phillip Wood
2025-05-15 12:58 ` Junio C Hamano
2025-05-10 13:46 ` [PATCH v2 4/4] add-patch: add diff.context command line overrides Leon Michalak via GitGitGadget
2025-05-12 16:45 ` Junio C Hamano
2025-05-12 17:03 ` Leon Michalak
2025-05-13 13:52 ` Phillip Wood
2025-05-13 14:39 ` Phillip Wood
2025-05-13 15:05 ` Leon Michalak
2025-05-14 15:13 ` phillip.wood123
2025-06-28 16:34 ` [PATCH v3 0/4] Better support for customising context lines in --patch commands Leon Michalak via GitGitGadget
2025-06-28 16:34 ` [PATCH v3 1/4] test: use "test_grep" Leon Michalak via GitGitGadget
2025-06-30 16:23 ` Junio C Hamano
2025-06-28 16:34 ` [PATCH v3 2/4] test: use "test_config" Leon Michalak via GitGitGadget
2025-06-30 16:35 ` Junio C Hamano
2025-06-28 16:34 ` [PATCH v3 3/4] add-patch: respect diff.context configuration Leon Michalak via GitGitGadget
2025-06-30 16:55 ` Junio C Hamano
2025-07-01 10:00 ` Phillip Wood
2025-06-28 16:34 ` [PATCH v3 4/4] add-patch: add diff.context command line overrides Leon Michalak via GitGitGadget
2025-06-30 17:03 ` Junio C Hamano
2025-07-01 9:59 ` Phillip Wood [this message]
2025-07-01 15:54 ` Junio C Hamano
2025-07-02 14:07 ` Phillip Wood
2025-07-02 18:28 ` Junio C Hamano
2025-07-01 9:59 ` Phillip Wood
2025-06-30 16:16 ` [PATCH v3 0/4] Better support for customising context lines in --patch commands Junio C Hamano
2025-07-09 0:09 ` Junio C Hamano
2025-07-09 7:57 ` Leon Michalak
2025-07-09 15:32 ` Junio C Hamano
2025-07-19 12:28 ` [PATCH v4 " Leon Michalak via GitGitGadget
2025-07-19 12:28 ` [PATCH v4 1/4] t: use test_grep in t3701 and t4055 Leon Michalak via GitGitGadget
2025-07-19 12:28 ` [PATCH v4 2/4] t: use test_config in t4055 Leon Michalak via GitGitGadget
2025-07-19 12:28 ` [PATCH v4 3/4] add-patch: respect diff.context configuration Leon Michalak via GitGitGadget
2025-07-19 12:28 ` [PATCH v4 4/4] add-patch: add diff.context command line overrides Leon Michalak via GitGitGadget
2025-07-22 16:01 ` Phillip Wood
2025-07-22 18:02 ` Leon Michalak
2025-07-22 18:05 ` Leon Michalak
2025-07-23 9:41 ` Phillip Wood
2025-07-21 16:50 ` [PATCH v4 0/4] Better support for customising context lines in --patch commands Junio C Hamano
2025-07-22 16:05 ` Phillip Wood
2025-07-22 17:20 ` Junio C Hamano
2025-07-29 7:01 ` [PATCH v5 " Leon Michalak via GitGitGadget
2025-07-29 7:01 ` [PATCH v5 1/4] t: use test_grep in t3701 and t4055 Leon Michalak via GitGitGadget
2025-07-29 7:01 ` [PATCH v5 2/4] t: use test_config in t4055 Leon Michalak via GitGitGadget
2025-07-29 7:01 ` [PATCH v5 3/4] add-patch: respect diff.context configuration Leon Michalak via GitGitGadget
2025-07-29 7:01 ` [PATCH v5 4/4] add-patch: add diff.context command line overrides Leon Michalak via GitGitGadget
2025-07-29 15:21 ` [PATCH v5 0/4] Better support for customising context lines in --patch commands Phillip Wood
2025-07-29 15:55 ` Junio C Hamano
2025-07-29 16:18 ` Leon Michalak
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=7686a5e0-23c3-4e3a-b5ea-3b8c80ba54fa@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=leonmichalak6@gmail.com \
--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).