From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Feb 2016 22:46:39 +0000 (-0800)
Subject: am -i: fix "v"iew
X-Git-Tag: v2.7.3~14^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40?hp=--cc

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>
---

708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40
diff --git a/builtin/am.c b/builtin/am.c
index 1399c8dd88..56cf26e8b7 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -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);
 		}