From: Phillip Wood <phillip.wood123@gmail•com>
To: Leon Michalak via GitGitGadget <gitgitgadget@gmail•com>,
git@vger•kernel.org
Cc: 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 3/4] add-patch: respect diff.context configuration
Date: Tue, 1 Jul 2025 11:00:57 +0100 [thread overview]
Message-ID: <4fa954a7-ce48-41af-8106-21bb6f17d340@gmail.com> (raw)
In-Reply-To: <1ec8a1384862765795f17e2d0fcb7b601ef2b25f.1751128487.git.gitgitgadget@gmail.com>
Hi Leon
On 28/06/2025 17:34, Leon Michalak via GitGitGadget wrote:
> From: Leon Michalak <leonmichalak6@gmail•com>
>
> Various builtins that use add-patch infrastructure do not respect
> the user's diff.context and diff.interHunkContext file configurations.
> This patch fixes this inconsistency.
>
> This is because the plumbing commands used by "git add -p" to generate
> the diff do not read those config settings. Fix this by reading the
> config before generating the patch and passing it along to the diff
> command with the "-U" and "--inter-hunk-context" command-line options.
This looks good to me, thanks for working on it
Phillip
> Signed-off-by: Leon Michalak <leonmichalak6@gmail•com>
> ---
> add-interactive.c | 17 +++++++++++++++++
> add-interactive.h | 1 +
> add-patch.c | 6 ++++++
> t/t3701-add-interactive.sh | 22 ++++++++++++++++++++++
> 4 files changed, 46 insertions(+)
>
> diff --git a/add-interactive.c b/add-interactive.c
> index 97ff35b6f12a..e0aafb8dd02a 100644
> --- a/add-interactive.c
> +++ b/add-interactive.c
> @@ -39,8 +39,12 @@ static void init_color(struct repository *r, struct add_i_state *s,
> void init_add_i_state(struct add_i_state *s, struct repository *r)
> {
> const char *value;
> + int context;
> + int interhunkcontext;
>
> s->r = r;
> + s->context = -1;
> + s->interhunkcontext = -1;
>
> if (repo_config_get_value(r, "color.interactive", &value))
> s->use_color = -1;
> @@ -78,6 +82,19 @@ void init_add_i_state(struct add_i_state *s, struct repository *r)
> repo_config_get_string(r, "diff.algorithm",
> &s->interactive_diff_algorithm);
>
> + if (!repo_config_get_int(r, "diff.context", &context)) {
> + if (context < 0)
> + die(_("%s cannot be negative"), "diff.context");
> + else
> + s->context = context;
> + }
> + if (!repo_config_get_int(r, "diff.interHunkContext", &interhunkcontext)) {
> + if (interhunkcontext < 0)
> + die(_("%s cannot be negative"), "diff.interHunkContext");
> + else
> + s->interhunkcontext = interhunkcontext;
> + }
> +
> repo_config_get_bool(r, "interactive.singlekey", &s->use_single_key);
> if (s->use_single_key)
> setbuf(stdin, NULL);
> diff --git a/add-interactive.h b/add-interactive.h
> index 693f125e8e4b..c63f35b14be8 100644
> --- a/add-interactive.h
> +++ b/add-interactive.h
> @@ -18,6 +18,7 @@ struct add_i_state {
>
> int use_single_key;
> char *interactive_diff_filter, *interactive_diff_algorithm;
> + int context, interhunkcontext;
> };
>
> void init_add_i_state(struct add_i_state *s, struct repository *r);
> diff --git a/add-patch.c b/add-patch.c
> index 95c67d8c80c4..b43ca1600738 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -415,6 +415,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
> {
> struct strvec args = STRVEC_INIT;
> const char *diff_algorithm = s->s.interactive_diff_algorithm;
> + int diff_context = s->s.context;
> + int diff_interhunkcontext = s->s.interhunkcontext;
> struct strbuf *plain = &s->plain, *colored = NULL;
> struct child_process cp = CHILD_PROCESS_INIT;
> char *p, *pend, *colored_p = NULL, *colored_pend = NULL, marker = '\0';
> @@ -424,6 +426,10 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
> int res;
>
> strvec_pushv(&args, s->mode->diff_cmd);
> + if (diff_context != -1)
> + strvec_pushf(&args, "--unified=%i", diff_context);
> + if (diff_interhunkcontext != -1)
> + strvec_pushf(&args, "--inter-hunk-context=%i", diff_interhunkcontext);
> if (diff_algorithm)
> strvec_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
> if (s->revision) {
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index b088ee141ff4..18dc329ea1f6 100755
> --- a/t/t3701-add-interactive.sh
> +++ b/t/t3701-add-interactive.sh
> @@ -1230,4 +1230,26 @@ test_expect_success 'hunk splitting works with diff.suppressBlankEmpty' '
> test_cmp expect actual
> '
>
> +test_expect_success 'add -p respects diff.context' '
> + test_write_lines a b c d e f g h i j k l m >file &&
> + git add file &&
> + test_write_lines a b c d e f G h i j k l m >file &&
> + echo y | git -c diff.context=5 add -p >actual &&
> + test_grep "@@ -2,11 +2,11 @@" actual
> +'
> +
> +test_expect_success 'add -p respects diff.interHunkContext' '
> + test_write_lines a b c d e f g h i j k l m n o p q r s >file &&
> + git add file &&
> + test_write_lines a b c d E f g i i j k l m N o p q r s >file &&
> + echo y | git -c diff.interhunkcontext=2 add -p >actual &&
> + test_grep "@@ -2,16 +2,16 @@" actual
> +'
> +
> +test_expect_success 'add -p rejects negative diff.context' '
> + test_config diff.context -1 &&
> + test_must_fail git add -p 2>output &&
> + test_grep "diff.context cannot be negative" output
> +'
> +
> test_done
next prev parent reply other threads:[~2025-07-01 10:01 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 [this message]
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
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=4fa954a7-ce48-41af-8106-21bb6f17d340@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitgitgadget@gmail$(echo .)com \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=leonmichalak6@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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