Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
7ff2683 (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>
  • Loading branch information
Junio C Hamano committed Feb 17, 2016
1 parent 3e3a4a4 commit 708b8cc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin/am.c
Expand Up @@ -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);
}
Expand Down

0 comments on commit 708b8cc

Please sign in to comment.