From: Abraham Samuel Adekunle <abrahamadekunle50@gmail•com>
To: git@vger•kernel.org
Cc: Patrick Steinhardt <ps@pks•im>,
Phillip Wood <phillip.wood123@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: [GSoC PATCH v3] add -p: show user's hunk decision when selecting hunks
Date: Fri, 2 Jan 2026 19:51:05 +0100 [thread overview]
Message-ID: <aVgTmYhosEiGG3th@Adekunles-MacBook-Air.local> (raw)
In-Reply-To: <aVbgkySezz8YV6sN@Adekunles-MacBook-Air.local>
When a user is interactively deciding which hunks to use or skip for
staging, unstaging, stashing etc, there is no way to know the
decision previously chosen for a hunk when navigating through the
previous and next hunks using K/J respectively.
Improve the UI to explicitly show if a user has previously decided to
use a hunk (by pressing 'y') or skip the hunk (by pressing 'n').
This will improve clarity when and aid the navigation process for the
user.
Reported-by: Junio C Hamano <gitster@pobox•com>
Signed-off-by: Abraham Samuel Adekunle <abrahamadekunle50@gmail•com>
---
Changes in v2:
--------------
- Modified t3701-add-interactive.sh for conform to new changes
add-patch.c | 84 +++++++++++++++++++++-----------------
t/t3701-add-interactive.sh | 14 +++----
2 files changed, 54 insertions(+), 44 deletions(-)
diff --git a/add-patch.c b/add-patch.c
index 173a53241e..bc7a340d21 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -42,10 +42,10 @@ static struct patch_mode patch_mode_add = {
.apply_args = { "--cached", NULL },
.apply_check_args = { "--cached", NULL },
.prompt_mode = {
- N_("Stage mode change [y,n,q,a,d%s,?]? "),
- N_("Stage deletion [y,n,q,a,d%s,?]? "),
- N_("Stage addition [y,n,q,a,d%s,?]? "),
- N_("Stage this hunk [y,n,q,a,d%s,?]? ")
+ N_("Stage mode change%s[y,n,q,a,d%s,?]? "),
+ N_("Stage deletion%s[y,n,q,a,d%s,?]? "),
+ N_("Stage addition%s[y,n,q,a,d%s,?]? "),
+ N_("Stage this hunk%s[y,n,q,a,d%s,?]? ")
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for staging."),
@@ -64,10 +64,10 @@ static struct patch_mode patch_mode_stash = {
.apply_args = { "--cached", NULL },
.apply_check_args = { "--cached", NULL },
.prompt_mode = {
- N_("Stash mode change [y,n,q,a,d%s,?]? "),
- N_("Stash deletion [y,n,q,a,d%s,?]? "),
- N_("Stash addition [y,n,q,a,d%s,?]? "),
- N_("Stash this hunk [y,n,q,a,d%s,?]? "),
+ N_("Stash mode change%s[y,n,q,a,d%s,?]? "),
+ N_("Stash deletion%s[y,n,q,a,d%s,?]? "),
+ N_("Stash addition%s[y,n,q,a,d%s,?]? "),
+ N_("Stash this hunk%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for stashing."),
@@ -88,10 +88,10 @@ static struct patch_mode patch_mode_reset_head = {
.is_reverse = 1,
.index_only = 1,
.prompt_mode = {
- N_("Unstage mode change [y,n,q,a,d%s,?]? "),
- N_("Unstage deletion [y,n,q,a,d%s,?]? "),
- N_("Unstage addition [y,n,q,a,d%s,?]? "),
- N_("Unstage this hunk [y,n,q,a,d%s,?]? "),
+ N_("Unstage mode change%s[y,n,q,a,d%s,?]? "),
+ N_("Unstage deletion%s[y,n,q,a,d%s,?]? "),
+ N_("Unstage addition%s[y,n,q,a,d%s,?]? "),
+ N_("Unstage this hunk%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for unstaging."),
@@ -111,10 +111,10 @@ static struct patch_mode patch_mode_reset_nothead = {
.apply_check_args = { "--cached", NULL },
.index_only = 1,
.prompt_mode = {
- N_("Apply mode change to index [y,n,q,a,d%s,?]? "),
- N_("Apply deletion to index [y,n,q,a,d%s,?]? "),
- N_("Apply addition to index [y,n,q,a,d%s,?]? "),
- N_("Apply this hunk to index [y,n,q,a,d%s,?]? "),
+ N_("Apply mode change to index%s[y,n,q,a,d%s,?]? "),
+ N_("Apply deletion to index%s[y,n,q,a,d%s,?]? "),
+ N_("Apply addition to index%s[y,n,q,a,d%s,?]? "),
+ N_("Apply this hunk to index%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for applying."),
@@ -134,10 +134,10 @@ static struct patch_mode patch_mode_checkout_index = {
.apply_check_args = { "-R", NULL },
.is_reverse = 1,
.prompt_mode = {
- N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
- N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
- N_("Discard addition from worktree [y,n,q,a,d%s,?]? "),
- N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
+ N_("Discard mode change from worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard deletion from worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard addition from worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard this hunk from worktree%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for discarding."),
@@ -157,10 +157,10 @@ static struct patch_mode patch_mode_checkout_head = {
.apply_check_args = { "-R", NULL },
.is_reverse = 1,
.prompt_mode = {
- N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
- N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
- N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
- N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
+ N_("Discard mode change from index and worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard deletion from index and worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard addition from index and worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard this hunk from index and worktree%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for discarding."),
@@ -179,10 +179,10 @@ static struct patch_mode patch_mode_checkout_nothead = {
.apply_for_checkout = 1,
.apply_check_args = { NULL },
.prompt_mode = {
- N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
- N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
- N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
- N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
+ N_("Apply mode change to index and worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Apply deletion to index and worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Apply addition to index and worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Apply this hunk to index and worktree%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for applying."),
@@ -202,10 +202,10 @@ static struct patch_mode patch_mode_worktree_head = {
.apply_check_args = { "-R", NULL },
.is_reverse = 1,
.prompt_mode = {
- N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
- N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
- N_("Discard addition from worktree [y,n,q,a,d%s,?]? "),
- N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
+ N_("Discard mode change from worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard deletion from worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard addition from worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Discard this hunk from worktree%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for discarding."),
@@ -224,10 +224,10 @@ static struct patch_mode patch_mode_worktree_nothead = {
.apply_args = { NULL },
.apply_check_args = { NULL },
.prompt_mode = {
- N_("Apply mode change to worktree [y,n,q,a,d%s,?]? "),
- N_("Apply deletion to worktree [y,n,q,a,d%s,?]? "),
- N_("Apply addition to worktree [y,n,q,a,d%s,?]? "),
- N_("Apply this hunk to worktree [y,n,q,a,d%s,?]? "),
+ N_("Apply mode change to worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Apply deletion to worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Apply addition to worktree%s[y,n,q,a,d%s,?]? "),
+ N_("Apply this hunk to worktree%s[y,n,q,a,d%s,?]? "),
},
.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
"will immediately be marked for applying."),
@@ -1448,6 +1448,7 @@ static int patch_update_file(struct add_p_state *s,
ssize_t i, undecided_previous, undecided_next, rendered_hunk_index = -1;
struct hunk *hunk;
char ch;
+ const char *hunk_use_decision;
struct child_process cp = CHILD_PROCESS_INIT;
int colored = !!s->colored.len, quit = 0, use_pager = 0;
enum prompt_mode_type prompt_mode_type;
@@ -1564,8 +1565,17 @@ static int patch_update_file(struct add_p_state *s,
(uintmax_t)(file_diff->hunk_nr
? file_diff->hunk_nr
: 1));
+ if (file_diff->hunk_nr) {
+ if (hunk->use == USE_HUNK)
+ hunk_use_decision = _(" (previous decision: use) ");
+ else if (hunk->use == SKIP_HUNK)
+ hunk_use_decision = _(" (previous decision: skip) ");
+ else
+ hunk_use_decision = " ";
+
+ }
printf(_(s->mode->prompt_mode[prompt_mode_type]),
- s->buf.buf);
+ hunk_use_decision, s->buf.buf);
if (*s->s.reset_color_interactive)
fputs(s->s.reset_color_interactive, stdout);
fflush(stdout);
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 4285314f35..e856683496 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -527,7 +527,7 @@ test_expect_success 'goto hunk 1 with "g 1"' '
_10
+15
_20
- (1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
+ (1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
EOF
test_write_lines s y g 1 | git add -p >actual &&
tail -n 7 <actual >actual.trimmed &&
@@ -540,7 +540,7 @@ test_expect_success 'goto hunk 1 with "g1"' '
_10
+15
_20
- (1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
+ (1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
EOF
test_write_lines s y g1 | git add -p >actual &&
tail -n 4 <actual >actual.trimmed &&
@@ -554,7 +554,7 @@ test_expect_success 'navigate to hunk via regex /pattern' '
_10
+15
_20
- (1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
+ (1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
EOF
test_write_lines s y /1,2 | git add -p >actual &&
tail -n 5 <actual >actual.trimmed &&
@@ -567,7 +567,7 @@ test_expect_success 'navigate to hunk via regex / pattern' '
_10
+15
_20
- (1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
+ (1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
EOF
test_write_lines s y / 1,2 | git add -p >actual &&
tail -n 4 <actual >actual.trimmed &&
@@ -579,11 +579,11 @@ test_expect_success 'print again the hunk' '
tr _ " " >expect <<-EOF &&
+15
20
- (1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? @@ -1,2 +1,3 @@
+ (1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? @@ -1,2 +1,3 @@
10
+15
20
- (1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
+ (1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?_
EOF
test_write_lines s y g 1 p | git add -p >actual &&
tail -n 7 <actual >actual.trimmed &&
@@ -810,7 +810,7 @@ test_expect_success 'colors can be overridden' '
<BOLD>-old<RESET>
<BLUE>+new<RESET>
<CYAN> more-context<RESET>
- <YELLOW>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>
+ <YELLOW>(1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>
EOF
test_cmp expect actual
'
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2026-01-02 18:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-30 15:06 [PATCH] add -p: show hunk selection state when selecting hunks Abraham Samuel Adekunle
2025-11-30 18:32 ` Junio C Hamano
2025-12-01 10:01 ` Abraham Samuel Adekunle
2026-01-01 21:04 ` [GSoC PATCH v2] add -p: show user's hunk decision " Abraham Samuel Adekunle
2026-01-01 22:54 ` Junio C Hamano
2026-01-02 7:20 ` Samuel Abraham
2026-01-02 18:51 ` Abraham Samuel Adekunle [this message]
2026-01-04 6:03 ` [GSoC PATCH v3] " Junio C Hamano
2026-01-04 10:36 ` Samuel Abraham
2026-01-04 11:02 ` [GSoC PATCH v4] " Abraham Samuel Adekunle
2026-01-05 19:35 ` SZEDER Gábor
2026-01-05 21:52 ` Samuel Abraham
2026-01-06 11:05 ` [GSoC PATCH v5] " Abraham Samuel Adekunle
2026-01-06 11:08 ` Kristoffer Haugsbakk
2026-01-06 11:46 ` Samuel Abraham
2026-01-06 12:01 ` [GSoC PATCH v6] " Abraham Samuel Adekunle
2026-01-06 16:10 ` Phillip Wood
2026-01-06 19:01 ` Ben Knoble
2026-01-07 0:13 ` Junio C Hamano
2026-01-06 22:02 ` Samuel Abraham
2026-01-06 22:19 ` Samuel Abraham
2026-01-07 8:49 ` Samuel Abraham
2026-01-08 15:07 ` [GSoC PATCH v7] " Abraham Samuel Adekunle
2026-01-11 3:57 ` Junio C Hamano
2026-01-11 11:04 ` 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=aVgTmYhosEiGG3th@Adekunles-MacBook-Air.local \
--to=abrahamadekunle50@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=phillip.wood123@gmail$(echo .)com \
--cc=ps@pks$(echo .)im \
/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