From: Junio C Hamano Date: Tue, 16 Feb 2016 23:06:57 GMT Subject: [PATCH 3/3] am -i: fix "v"iew Message-ID: <1455664017-27588-4-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 previous refactoring of the new helper function makes it easier for us to do the right thing. Signed-off-by: Junio C Hamano --- builtin/am.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 1399c8d..aecf917 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1740,8 +1740,9 @@ static int do_interactive(struct am_state *state) if (!pager) pager = "cat"; - argv_array_push(&cp.args, pager); - argv_array_push(&cp.args, am_path(state, "patch")); + + prepare_pager_args(&cp, pager, + am_path(state, "patch"), NULL); run_command(&cp); } } -- 2.7.1-460-gd45d0a4