Browse Source

am -i: fix "v"iew

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 previous refactoring of the new helper function makes it easier
for us to do the right thing.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 9 years ago
parent
commit
708b8cc9a1
  1. 2
      builtin/am.c

2
builtin/am.c

@ -1740,7 +1740,7 @@ static int do_interactive(struct am_state *state) @@ -1740,7 +1740,7 @@ static int do_interactive(struct am_state *state)

if (!pager)
pager = "cat";
argv_array_push(&cp.args, pager);
prepare_pager_args(&cp, pager);
argv_array_push(&cp.args, am_path(state, "patch"));
run_command(&cp);
}

Loading…
Cancel
Save