All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Abraham Samuel Adekunle <abrahamadekunle50@gmail.com>
Cc: git@vger.kernel.org,  Patrick Steinhardt <ps@pks.im>,
	 Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [GSoC PATCH v3] add -p: show user's hunk decision when selecting hunks
Date: Sun, 04 Jan 2026 15:03:09 +0900	[thread overview]
Message-ID: <xmqqzf6tncde.fsf@gitster.g> (raw)
In-Reply-To: <aVgTmYhosEiGG3th@Adekunles-MacBook-Air.local> (Abraham Samuel Adekunle's message of "Fri, 2 Jan 2026 19:51:05 +0100")

Abraham Samuel Adekunle <abrahamadekunle50@gmail.com> writes:

> 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

Here is how "cd t && sh t3701-add-interactive.sh -i -v" ends for me.

expecting success of 3701.50 'print again the hunk (PAGER)':
        test_when_finished "git reset" &&
        cat >expect <<-EOF &&
        <GREEN>+<RESET><GREEN>15<RESET>
         20<RESET>
        <BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
        PAGER  10<RESET>
        PAGER <GREEN>+<RESET><GREEN>15<RESET>
        PAGER  20<RESET>
        <BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>
        EOF
        test_write_lines s y g 1 P |
        (
                GIT_PAGER="sed s/^/PAGER\ /" &&
                export GIT_PAGER &&
                test_terminal git add -p >actual
        ) &&
        tail -n 7 <actual | test_decode_color >actual.trimmed &&
        test_cmp expect actual.trimmed

--- expect      2026-01-04 06:01:25.931220332 +0000
+++ actual.trimmed      2026-01-04 06:01:26.079845771 +0000
@@ -1,7 +1,7 @@
 <GREEN>+<RESET><GREEN>15<RESET>
  20<RESET>
-<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
+<BOLD;BLUE>(1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
 PAGER  10<RESET>
 PAGER <GREEN>+<RESET><GREEN>15<RESET>
 PAGER  20<RESET>
-<BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>
+<BOLD;BLUE>(1/2) Stage this hunk (previous decision: use) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>
not ok 50 - print again the hunk (PAGER)
#
#               test_when_finished "git reset" &&
#               cat >expect <<-EOF &&
#               <GREEN>+<RESET><GREEN>15<RESET>
#                20<RESET>
#               <BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>PAGER <CYAN>@@ -1,2 +1,3 @@<RESET>
#               PAGER  10<RESET>
#               PAGER <GREEN>+<RESET><GREEN>15<RESET>
#               PAGER  20<RESET>
#               <BOLD;BLUE>(1/2) Stage this hunk [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]? <RESET>
#               EOF
#               test_write_lines s y g 1 P |
#               (
#                       GIT_PAGER="sed s/^/PAGER\ /" &&
#                       export GIT_PAGER &&
#                       test_terminal git add -p >actual
#               ) &&
#               tail -n 7 <actual | test_decode_color >actual.trimmed &&
#               test_cmp expect actual.trimmed
#
1..50

  reply	other threads:[~2026-01-04  6:03 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   ` [GSoC PATCH v3] " Abraham Samuel Adekunle
2026-01-04  6:03     ` Junio C Hamano [this message]
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=xmqqzf6tncde.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=abrahamadekunle50@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=phillip.wood123@gmail.com \
    --cc=ps@pks.im \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.