From: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>
To: git@vger.kernel.org
Cc: "Patrick Steinhardt" <ps@pks.im>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>,
"Ben Knoble" <ben.knoble@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v2 0/1] Allow reworking with a file when making hunk decisions
Date: Tue, 27 Jan 2026 16:43:06 +0100 [thread overview]
Message-ID: <cover.1769522219.git.abrahamadekunle50@gmail.com> (raw)
In-Reply-To: <cover.1769164663.git.abrahamadekunle50@gmail.com>
Hello,
After review and suggestions from Junio, I have been able to add the '<' and '>'
options for going to the previous file and next file respectively.
If there is only one file, neither of the options will be available, if we are in the
second of three or more file, both '<' and '>' will be available and if we are at the last file,
only '<' will be available.
This will enable simultaneous hunk decisions between between files.
After all decisions have been made in a file, a prompt shows which asks
"All hunks decided. What now?" that allows reworking with the file,
moving to the next or previous file as the case may be.
Since all hunks in the file have been decided, if the user navigates to a particular
hunk with 'K' or 'J' and redecides on an already decided hunk with options such as, 'y' or 'n',
the user is taken back to the first hunk with the "what now?" prompt shown.
The decision to use 'q' as a submit is because after some or all the decisions have been made
in a file, 'q' submits them as is even though in the `help_patch_text` it say `q` will
not stage the current hunk and all hunks after it. This is not true if hunks decisions
have been made and the user navigates with 'K' and 'J' or uses 'a' to select all hunks and
'q' after wards
I have not attempted to work on the t/3701-interactive.sh yet but this will be done
after concensus on the UI when all hunks have been decided.
Abraham Samuel Adekunle (1):
Allow reworking with a file after deciding on all its hunks
add-patch.c | 139 ++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 102 insertions(+), 37 deletions(-)
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2026-01-27 15:42 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-23 11:56 [RFC PATCH 0/1] add-patch: Allow reworking with a file after deciding on its hunks Abraham Samuel Adekunle
2026-01-23 11:58 ` [RFC PATCH 1/1] add-patch: Allow reworking with a file after deciding on all " Abraham Samuel Adekunle
2026-01-23 16:38 ` Junio C Hamano
2026-01-23 21:43 ` Samuel Abraham
2026-01-27 15:43 ` Abraham Samuel Adekunle [this message]
2026-01-27 15:45 ` [PATCH v2 1/1] " Abraham Samuel Adekunle
2026-01-27 20:48 ` Junio C Hamano
2026-01-28 11:26 ` Samuel Abraham
2026-01-30 9:22 ` Samuel Abraham
2026-01-30 16:29 ` Junio C Hamano
2026-01-30 17:36 ` Samuel Abraham
2026-01-31 19:25 ` Junio C Hamano
2026-02-02 11:14 ` Samuel Abraham
2026-02-02 17:26 ` Junio C Hamano
2026-02-03 9:55 ` Samuel Abraham
2026-01-27 17:04 ` [PATCH v2 0/1] Allow reworking with a file when making hunk decisions Junio C Hamano
2026-01-28 9:49 ` Samuel Abraham
2026-02-06 15:52 ` [PATCH v3 0/3] introduce new option `rework-with-file` Abraham Samuel Adekunle
2026-02-06 15:54 ` [PATCH v3 1/3] interactive -p: add new `--rework-with-file` flag to interactive machinery Abraham Samuel Adekunle
2026-02-06 18:25 ` Junio C Hamano
2026-02-06 20:21 ` Samuel Abraham
2026-02-06 15:56 ` [PATCH v3 2/3] add-patch: Allow interfile navigation when selecting hunks Abraham Samuel Adekunle
2026-02-06 18:35 ` Junio C Hamano
2026-02-06 20:22 ` Samuel Abraham
2026-02-06 18:54 ` Junio C Hamano
2026-02-06 20:32 ` Samuel Abraham
2026-02-06 19:21 ` Junio C Hamano
2026-02-06 20:37 ` Samuel Abraham
2026-02-12 10:32 ` Samuel Abraham
2026-02-12 17:25 ` Junio C Hamano
2026-02-12 21:13 ` Samuel Abraham
2026-02-12 21:31 ` Junio C Hamano
2026-02-12 22:20 ` Samuel Abraham
2026-02-06 15:57 ` [PATCH v3 3/3] add-patch: Allow proper 'git apply' when using the --rework-with-file flag Abraham Samuel Adekunle
2026-02-06 19:02 ` Junio C Hamano
2026-02-06 20:39 ` Samuel Abraham
2026-02-06 19:19 ` [PATCH v3 0/3] introduce new option `rework-with-file` Junio C Hamano
2026-02-06 20:40 ` Samuel Abraham
2026-02-13 22:08 ` [PATCH v4 0/4] introduce new option `--auto-advance` Abraham Samuel Adekunle
2026-02-13 22:09 ` [PATCH v4 1/4] interactive -p: add new `--auto-advance` flag Abraham Samuel Adekunle
2026-02-13 23:04 ` Junio C Hamano
2026-02-14 9:16 ` Samuel Abraham
2026-02-13 22:10 ` [PATCH v4 2/4] add-patch: modify patch_update_file() signature Abraham Samuel Adekunle
2026-02-13 23:33 ` Junio C Hamano
2026-02-14 10:14 ` Samuel Abraham
2026-02-13 22:11 ` [PATCH v4 3/4] add-patch: allow all-or-none application of patches Abraham Samuel Adekunle
2026-02-13 22:12 ` [PATCH v4 4/4] add-patch: allow interfile navigation when selecting hunks Abraham Samuel Adekunle
2026-02-14 11:01 ` [PATCH v5 0/4] introduce new option `--auto-advance` Abraham Samuel Adekunle
2026-02-14 11:03 ` [PATCH v5 1/4] interactive -p: add new `--auto-advance` flag Abraham Samuel Adekunle
2026-02-14 11:04 ` [PATCH v5 2/4] add-patch: modify patch_update_file() signature Abraham Samuel Adekunle
2026-02-14 11:06 ` [PATCH v5 3/4] add-patch: allow all-or-none application of patches Abraham Samuel Adekunle
2026-02-14 11:06 ` [PATCH v5 4/4] add-patch: allow interfile navigation when selecting hunks Abraham Samuel Adekunle
2026-02-20 22:32 ` [PATCH v5 0/4] introduce new option `--auto-advance` Junio C Hamano
2026-02-21 9:06 ` Samuel Abraham
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=cover.1769522219.git.abrahamadekunle50@gmail.com \
--to=abrahamadekunle50@gmail.com \
--cc=ben.knoble@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=phillip.wood123@gmail.com \
--cc=ps@pks.im \
--cc=szeder.dev@gmail.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