[PATCH v2 1/3] pager: lose a separate argv[]
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:08:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
These days, using the embedded args array in the child_process structure is the norm. Follow that practice. Signed-off-by: Junio C Hamano <redacted> --- * Same as v1 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-489-g20b2cbe