From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Mar 2016 19:13:40 +0000 (-0800)
Subject: Merge branch 'jc/am-i-v-fix' into maint
X-Git-Tag: v2.7.3~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/28eec80b602559403cca96531dce2930ac362095

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

28eec80b602559403cca96531dce2930ac362095
diff --cc pager.c
index e425070528,cb28207c48..4bc048148e
--- a/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);