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

Re: [PATCH 0/6] fix hunk editing with 'commit -p -m'

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 6, 2014, 21:15 UTC
Message-ID
<xmqqvbvrvxk8.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1394117424-29780-1-git-send-email-benoit.pierre@gmail.com>
Benoit Pierre <benoit.pierre@gmail.com> writes:
Show 10 quoted lines
> This patch fixes the fact that hunk editing with 'commit -p -m' does not work:
> GIT_EDITOR is set to ':' to indicate to hooks that no editor will be launched,
> which result in the 'hunk edit' option not launching the editor (and selecting
> the whole hunk).
>
> The fix consists in deferring the GIT_EDITOR override to the hook subprocess,
> like it's already done for GIT_INDEX_FILE:
> - modify 'run_hook' so the first parameter is the environment to set
> - add a 'run_hook_v' variant that take a va_list
> - add a new 'run_commit_hook' helper (to set both GIT_EDITOR and GIT_INDEX_FILE)

I sense that this is in line with one of the "leftover bits" items I keep in http://git-blame.blogspot.com/p/leftover-bits.html, especially http://thread.gmane.org/gmane.comp.version-control.git/192669/focus=192806 ;-)

Previous: Junio C Hamano
Message 16 of 16 in “fix hunk editing with 'commit -p -m'”
  1. 0/6 fix hunk editing with 'commit -p -m'Benoit Pierre, Mar 6, 2014
  2. 1/6 test patch hunk editing with "commit -p -m"Benoit Pierre, Mar 6, 2014
  3. Eric SunshineMar 6, 2014
  4. Junio C HamanoMar 6, 2014
  5. 2/6 commit: fix patch hunk editing with "commit -p -m"Benoit Pierre, Mar 6, 2014
  6. Junio C HamanoMar 6, 2014
  7. Junio C HamanoMar 6, 2014
  8. 3/6 merge: fix GIT_EDITOR override for commit hookBenoit Pierre, Mar 6, 2014
  9. 4/6 merge hook tests: fix and update testsBenoit Pierre, Mar 6, 2014
  10. Eric SunshineMar 6, 2014
  11. 5/6 merge hook tests: fix missing '&&' in testBenoit Pierre, Mar 6, 2014
  12. Junio C HamanoMar 6, 2014
  13. 6/6 merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre, Mar 6, 2014
  14. Junio C HamanoMar 6, 2014
  15. Junio C HamanoMar 7, 2014
  16. Junio C HamanoMar 6, 2014

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.