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

[PATCH v2 0/3] fix "v"iew subcommand in "git am -i"

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 17, 2016, 19:15 UTC
Message-ID
<1455736516-13466-1-git-send-email-gitster@pobox.com>
In-Reply-To
<1455664017-27588-1-git-send-email-gitster@pobox.com>

The 'v'iew subcommand of the interactive mode of "git am -i" was broken by the rewrite to C we did at around 2.6.0 timeframe at 7ff26832 (builtin-am: implement -i/--interactive, 2015-08-04); we used to spawn the pager via the shell, accepting things like

	PAGER='less -S'

in the environment, but the rewrite forgot and tried to directly spawn a command whose name is the entire string.

The bug is understandable, because there are things we need to do other than just run_command() to run the pager, such as running it with default LESS/LV settings and running it via the shell, but these pieces of necessary knowledge about what is the right thing to do are hoarded by the setup_pager() entry point, which is only good if we are feeding our own standard output to the pager. A codepath that wants to run the pager but not on our output needs to do the right thing on its own.

So the first patch in this series factors out a helper function to let the caller run the pager the right way. They make the third patch to fix the breakage in "am" trivial. Compared to v1, the helper was much simplified with help by Peff: it always and only takes child-process and the pager command string. The caller can append extra command line arguments after the helper returns if it wants to.

Junio C Hamano (3):
  pager: lose a separate argv[]
  pager: factor out a helper to prepare a child process to run the pager
  am -i: fix "v"iew
 builtin/am.c |  2 +-
 cache.h      |  3 +++
 pager.c      | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)
-- 
2.7.1-489-g20b2cbe
Previous: Junio C HamanoNext: Junio C Hamano
Message 8 of 12 in “fix "v"iew subcommand in "git am -i"”
  1. 0/3 fix "v"iew subcommand in "git am -i"Junio C Hamano, Feb 16, 2016
  2. 1/3 pager: lose a separate argv[]Junio C Hamano, Feb 16, 2016
  3. 2/3 pager: factor out a helper to prepare a child process to run the pagerJunio C Hamano, Feb 16, 2016
  4. Jeff KingFeb 16, 2016
  5. Junio C HamanoFeb 16, 2016
  6. Jeff KingFeb 17, 2016
  7. 3/3 am -i: fix "v"iewJunio C Hamano, Feb 16, 2016
  8. 0/3 fix "v"iew subcommand in "git am -i"Junio C Hamano, Feb 17, 2016
  9. 1/3 pager: lose a separate argv[]Junio C Hamano, Feb 17, 2016
  10. 2/3 pager: factor out a helper to prepare a child process to run the pagerJunio C Hamano, Feb 17, 2016
  11. 3/3 am -i: fix "v"iewJunio C Hamano, Feb 17, 2016
  12. Jeff KingFeb 17, 2016

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.