git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 2/3] add-patch: Allow interfile navigation when selecting hunks

From
Samuel Abraham <abrahamadekunle50@gmail.com>
Date
Feb 12, 2026, 22:20 UTC
Message-ID
<CADYq+fZ3b-bEBt_7B-KvGi9vyCOc6=pxVgx+Wbod-TM4oMaKog@mail.gmail.com>
In-Reply-To
<xmqqh5rlmywp.fsf@gitster.g>
On Thu, Feb 12, 2026 at 10:31 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 42 quoted lines
>
> Samuel Abraham <abrahamadekunle50@gmail.com> writes:
>
> >> There was a separate topic that added "(was: [yn])" to the prompt
> >> when the prompt asks about a hunk that already has been decided on.
> >> As we only need a single bit "all hunks decided", can we do
> >> something similar, I wonder?  At the beginning of the main prompt,
> >> we show which of the N available hunks we are currently at, e.g.,
> >>
> >>  (1/2) Stage this hunk (was: y) [y,n,q,a,d,k,K,j,J,g,/,e,p,P,?]?
> >>
> >> Perhaps we can add a third number to indicate how many of the
> >> available hunks the user has already decided, or something, that can
> >> be used to avoid this wasted line?  Or is it a good thing that we
> >> are loud in this case using a whole line to remind the user that it
> >> may be time to move on?  I dunno.
> >
> > I thought of a suggestion where after deciding on all hunks in the
> > file, the user
> > will be able to see the "what now prompt", the options for the current hunk and
> > also the previous decision on the hunk since at this point, all the
> > hunks would have been decided on.
> >
> > I tried something like
> >
> > What now? (was: n) [y,n,q,a,d,s,e,>,<,p,P,?]?
> >
> > This does not show the number of the hunk we are currently at and the
> > "Stage this hunk" since the decision had been made initially but the "whatnow"
> > prompt still provides a chance to change the decision, while showing
> > the previous
> > decision on the hunk by asking "What now?" instead.
> > The options have the default [y,n,q,a,d] and the remaining options are populated
> > from the permit set for the hunk. SO the user can still carry out the
> > normal actions on
> > the hunk.
>
> I like the compactness of that myself, but I have to say that the
> end-users may feel lost and utterly confused with the distinction,
> if they are left without being explained why we switch between
> "Stage this" (which by the way changes phrasing depending on what
> you are doing) and "What now".
Yes I agree.
Show 10 quoted lines
>
> Is it so important to indicate that everything in the hunk has been
> decided?  They'd lose 'j' 'k' when there no longer remains undecided
> ones, and every hunk they revisit with 'J' or 'K' would say (was: X),
> which may be a clue enough that they are done with the file, and
> when they really really wanted to make sure, perhaps they can type
> '?' and that help can spend a line to say "Out of 8 hunks, you have
> already decided to use 3 hunks, and skip 5 hunks" or something?
>
> I dunno.

Yes I also think this works. It is not so important to indicate that everything has been decided. The (was: X) shows that the hunk has been decided on and it should be enough. I will add the information to the help_patch section. Thanks

Abraham
Previous: Junio C HamanoNext: Abraham Samuel Adekunle
Message 33 of 54 in “add-patch: Allow reworking with a file after deciding on its hunks”
  1. 0/1 add-patch: Allow reworking with a file after deciding on its hunksAbraham Samuel Adekunle, Jan 23, 2026
  2. 1/1 add-patch: Allow reworking with a file after deciding on all its hunksAbraham Samuel Adekunle, Jan 23, 2026
  3. Junio C HamanoJan 23, 2026
  4. Samuel AbrahamJan 23, 2026
  5. 0/1 Allow reworking with a file when making hunk decisionsAbraham Samuel Adekunle, Jan 27, 2026
  6. 1/1 Allow reworking with a file after deciding on all its hunksAbraham Samuel Adekunle, Jan 27, 2026
  7. Junio C HamanoJan 27, 2026
  8. Samuel AbrahamJan 28, 2026
  9. Samuel AbrahamJan 30, 2026
  10. Junio C HamanoJan 30, 2026
  11. Samuel AbrahamJan 30, 2026
  12. Junio C HamanoJan 31, 2026
  13. Samuel AbrahamFeb 2, 2026
  14. Junio C HamanoFeb 2, 2026
  15. Samuel AbrahamFeb 3, 2026
  16. Junio C HamanoJan 27, 2026
  17. Samuel AbrahamJan 28, 2026
  18. 0/3 introduce new option `rework-with-file`Abraham Samuel Adekunle, Feb 6, 2026
  19. 1/3 interactive -p: add new `--rework-with-file` flag to interactive machineryAbraham Samuel Adekunle, Feb 6, 2026
  20. Junio C HamanoFeb 6, 2026
  21. Samuel AbrahamFeb 6, 2026
  22. 2/3 add-patch: Allow interfile navigation when selecting hunksAbraham Samuel Adekunle, Feb 6, 2026
  23. Junio C HamanoFeb 6, 2026
  24. Samuel AbrahamFeb 6, 2026
  25. Junio C HamanoFeb 6, 2026
  26. Samuel AbrahamFeb 6, 2026
  27. Junio C HamanoFeb 6, 2026
  28. Samuel AbrahamFeb 6, 2026
  29. Samuel AbrahamFeb 12, 2026
  30. Junio C HamanoFeb 12, 2026
  31. Samuel AbrahamFeb 12, 2026
  32. Junio C HamanoFeb 12, 2026
  33. Samuel AbrahamFeb 12, 2026
  34. 3/3 add-patch: Allow proper 'git apply' when using the --rework-with-file flagAbraham Samuel Adekunle, Feb 6, 2026
  35. Junio C HamanoFeb 6, 2026
  36. Samuel AbrahamFeb 6, 2026
  37. Junio C HamanoFeb 6, 2026
  38. Samuel AbrahamFeb 6, 2026
  39. 0/4 introduce new option `--auto-advance`Abraham Samuel Adekunle, Feb 13, 2026
  40. 1/4 interactive -p: add new `--auto-advance` flagAbraham Samuel Adekunle, Feb 13, 2026
  41. Junio C HamanoFeb 13, 2026
  42. Samuel AbrahamFeb 14, 2026
  43. 2/4 add-patch: modify patch_update_file() signatureAbraham Samuel Adekunle, Feb 13, 2026
  44. Junio C HamanoFeb 13, 2026
  45. Samuel AbrahamFeb 14, 2026
  46. 3/4 add-patch: allow all-or-none application of patchesAbraham Samuel Adekunle, Feb 13, 2026
  47. 4/4 add-patch: allow interfile navigation when selecting hunksAbraham Samuel Adekunle, Feb 13, 2026
  48. 0/4 introduce new option `--auto-advance`Abraham Samuel Adekunle, Feb 14, 2026
  49. 1/4 interactive -p: add new `--auto-advance` flagAbraham Samuel Adekunle, Feb 14, 2026
  50. 2/4 add-patch: modify patch_update_file() signatureAbraham Samuel Adekunle, Feb 14, 2026
  51. 3/4 add-patch: allow all-or-none application of patchesAbraham Samuel Adekunle, Feb 14, 2026
  52. 4/4 add-patch: allow interfile navigation when selecting hunksAbraham Samuel Adekunle, Feb 14, 2026
  53. Junio C HamanoFeb 20, 2026
  54. Samuel AbrahamFeb 21, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.