diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 19:13:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 19:13:41 (GMT) |
| commit | 28eec80b602559403cca96531dce2930ac362095 (patch) | |
| tree | d7ff48184936b70d788f8d3aa7500c4134215c4f /builtin | |
| parent | 9c17ccaa49d00a87cefe0ef18a371e4f45e968fc (diff) | |
| parent | 708b8cc9a114ea1e5b90f5f52fd24ecade4e8b40 (diff) | |
| download | git-28eec80b602559403cca96531dce2930ac362095.zip git-28eec80b602559403cca96531dce2930ac362095.tar.gz git-28eec80b602559403cca96531dce2930ac362095.tar.bz2 | |
Merge branch 'jc/am-i-v-fix' into maint
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 95decc6..5668e0c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1821,7 +1821,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); } |