Merge branch 'ep/trace-doc-sample-fix' into maint

diff --git a/builtin/am.c b/builtin/am.c
index 259dc1cd117ec18d37d4199873c11bbf70ad6dfb..d003939bc5c65947451de4a6e1817eb0f184211f 100644 (file)
--- 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);
                }