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

Re: [RFC PATCH] git add -p: new "quit" command at the prompt.

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 15, 2009, 23:25 UTC
Message-ID
<7v7i1lqz24.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<vpqtz4rynhp.fsf@bauges.imag.fr>
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
> I think everybody agree that the intention of the patch is good (well,
> several pro, and no real counter-argument).

Oh, I think we have already passed that state long time ago. It's queued as c9cc8d9 ([NEEDS SIGN OFF, DOC, AND REVIEW] git add -p: new "quit" command at the prompt., 2009-04-10) in 'pu'.

I agree that there is a "Huh?" factor in the repeated and similar hunks to patch_update_file, but the first hunk is dealing with the mode change and the second one is about the patch text.

Currently parse_diff_header() returns the mode line into $mode and the main loop treats $mode differently from @hunk, which is an array of hunks parsed by parse_diff(). Treating $mode as a "fake hunk" by unshifting it at the beginning of @hunk array and teaching the main loop minor details such as $mode "fake hunk" cannot be edited nor split, I suspect we _could_ unify the two.

ca72468 (add--interactive: allow user to choose mode update, 2008-03-27) introduced this duplication. Jeff, what do you think? I am not sure if it is worth it.

Previous: Matthieu MoyNext: Jeff King
Message 9 of 15 in “git add -p: new "quit" command at the prompt.”
  1. git add -p: new "quit" command at the prompt.Matthieu Moy, Apr 10, 2009
  2. Junio C HamanoApr 11, 2009
  3. Matthieu MoyApr 12, 2009
  4. Sverre RabbelierApr 12, 2009
  5. Miles BaderApr 13, 2009
  6. Re: git add -p: new "quit" command at the prompt.Nicolas Sebrecht, Apr 12, 2009
  7. Wincent ColaiutaApr 13, 2009
  8. Matthieu MoyApr 14, 2009
  9. Junio C HamanoApr 15, 2009
  10. Jeff KingApr 16, 2009
  11. Jeff KingApr 16, 2009
  12. Jeff KingApr 16, 2009
  13. Matthieu MoyApr 16, 2009
  14. 1/2 git add -p: new "quit" command at the prompt.Matthieu Moy, Apr 16, 2009
  15. 2/2 Update git-add.txt according to the new possibilities of 'git add -p'.Matthieu Moy, Apr 16, 2009

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.