From: Junio C Hamano Date: Tue, 16 Feb 2016 23:06:55 GMT Subject: [PATCH 1/3] pager: lose a separate argv[] Message-ID: <1455664017-27588-2-git-send-email-gitster@pobox.com> In-Reply-To: <1455664017-27588-1-git-send-email-gitster@pobox.com> These days, using the embedded args array in the child_process structure is the norm. Follow that practice. Signed-off-by: Junio C Hamano --- pager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pager.c b/pager.c index 070dc11..5dbcc5a 100644 --- a/pager.c +++ b/pager.c @@ -11,7 +11,6 @@ * 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) @@ -70,9 +69,8 @@ void setup_pager(void) setenv("GIT_PAGER_IN_USE", "true", 1); /* spawn the pager */ - pager_argv[0] = pager; + argv_array_push(&pager_process.args, pager); pager_process.use_shell = 1; - pager_process.argv = pager_argv; pager_process.in = -1; if (!getenv("LESS")) argv_array_push(&pager_process.env_array, "LESS=FRX"); -- 2.7.1-460-gd45d0a4