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[]
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user