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[]

diff --cc builtin/am.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc pager.c
index e425070528f4f9fbf0953c9056d1ea43686e176f,cb28207c48b2b9adafc5a874ea9f5afc9a55842c..4bc048148e043eabf1315bbcbae8ea4c6363b330
--- 1/pager.c
--- 2/pager.c
+++ b/pager.c
@@@ -11,15 -11,12 +11,14 @@@
   * something different on Windows.
   */
  
- static const char *pager_argv[] = { NULL, NULL };
  static struct child_process pager_process = CHILD_PROCESS_INIT;
  
 -static void wait_for_pager(void)
 +static void wait_for_pager(int in_signal)
  {
 -      fflush(stdout);
 -      fflush(stderr);
 +      if (!in_signal) {
 +              fflush(stdout);
 +              fflush(stderr);
 +      }
        /* signal EOF to pager */
        close(1);
        close(2);