summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-16 22:46:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-17 17:52:20 (GMT)
commit708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40 (patch)
treef3a36499d0aef7a35f255649d77994927c9bc821 /builtin/am.c
parent3e3a4a41b0dac564c0302ced4ccc423d0d39bc21 (diff)
downloadgit-708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40.zip
git-708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40.tar.gz
git-708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40.tar.bz2
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>
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 1399c8d..56cf26e 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);
}