summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-24 21:26:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-24 21:26:01 (GMT)
commitc3b1e8d85133e2a19d372b7c166d5b49fcbbfef2 (patch)
tree0db4cfbd62218fbf54be4160420b6e9c67cd60a0 /builtin
parent595bfefa6c31fa6d76b686ed79b024838db5933e (diff)
parent708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40 (diff)
downloadgit-c3b1e8d85133e2a19d372b7c166d5b49fcbbfef2.zip
git-c3b1e8d85133e2a19d372b7c166d5b49fcbbfef2.tar.gz
git-c3b1e8d85133e2a19d372b7c166d5b49fcbbfef2.tar.bz2
Merge branch 'jc/am-i-v-fix'
The "v(iew)" subcommand of the interactive "git am -i" command was broken in 2.6.0 timeframe when the command was rewritten in C. * jc/am-i-v-fix: am -i: fix "v"iew pager: factor out a helper to prepare a child process to run the pager pager: lose a separate argv[]
Diffstat (limited to 'builtin')
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 259dc1c..d003939 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1806,7 +1806,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);
}