git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "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>,
	Phillip Wood <phillip.wood123@gmail.com>,
	 Leon Michalak <leonmichalak6@gmail.com>
Subject: Re: [PATCH v3 0/4] Better support for customising context lines in --patch commands
Date: Tue, 08 Jul 2025 17:09:20 -0700	[thread overview]
Message-ID: <xmqqms9eql73.fsf@gitster.g> (raw)
In-Reply-To: <pull.1915.v3.git.1751128486.gitgitgadget@gmail.com> (Leon Michalak via GitGitGadget's message of "Sat, 28 Jun 2025 16:34:42 +0000")

"Leon Michalak via GitGitGadget" <gitgitgadget@gmail.com> writes:

> This series of patches attempt to give --interactive/--patch compatible
> builtins ("add", "commit", "checkout", "reset", "restore" and "stash")
> better support and nicer experience for configuring how many context lines
> are shown in diffs through a variety of ways.
>
> Prior to these patches, the user could not choose how many context lines
> they saw in --patch commands (apart from one workaround by using
> GIT_DIFF_OPTS=-u<number> ..., however this isn't a good user experience or a
> persistent solution). Additionally, the behaviour around reading from the
> diff.context and diff.interHunkContext configs was also inconsistent with
> other diff generating commands such as "log -p".
>
> The summarised changes below hopefully make this experience better and fix
> some inconsistencies:
>
>  * diff.context and diff.interHunkContext configs are now respected by
>    --patch compatible commands
>  * --unified and --inter-hunk-context command line options have been added
>    to --patch compatible commands (which take prescendence over file
>    configs)
>  * "add" and "commit" in --interactive mode now expose a new "context"
>    subcommand which configures the amount of context lines you wish to see
>    in subsequent diffs generated from other subcommands such as "patch" or
>    "diff"
>
> The original discussion for this can be read at:
>
>  * https://lore.kernel.org/git/CAP9jKjGb-Rcr=RLJEzeFdtrekYM+qmHy+1T1fykU3n9cV4GhGw@mail.gmail.com/
>
> Changes since v1:
>
>  * Update commit descriptions
>  * Update tests to use the more modern and robust test_grep and test_config
>    utils
>  * Reword some documentation / user messages
>  * Ensure each commit is atomic and builds/passes tests on it's own
>  * Make new command line options DRY
>  * Add tests for interhunk context interaction
>  * Error if context config/command line options are negative
>  * Drop previous last commit to do with new subcommand for --interactive
>    add/commit. My motivations behind this patch series originally where
>    quite simple, just for add-patch commands to respect context configs.
>    This subcommand, after the discussion in v1, will require more thought
>    and a larger implementation that what I had anticipated. I would prefer
>    to leave this for another time as it's the least impactful but the most
>    time intensive and complicated idea.
>
> Changes since v2:
>
>  * Update tests to only test single command (following Philip's suggestion)
>  * Add negative option checks
>  * Minor commit re-wording

This iteration seems to have attracted a few review comments that
are left ananswered.  Will we see responses to them, and/or, a
hopefully small and final update sometime soon?

Thanks.

  parent reply	other threads:[~2025-07-09  0:09 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
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 [this message]
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=xmqqms9eql73.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=leonmichalak6@gmail.com \
    --cc=phillip.wood123@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).