mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pager: lose a separate argv[]

Browse Source 
These days, using the embedded args array in the child_process
structure is the norm.  Follow that practice.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2016-02-16 14:26:40 -08:00
parent 7aa2da6162
commit 43b0190224
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pager.c
View File

@ -11,7 +11,6 @@
* something different on Windows. * something different on Windows.
*/ */
static const char *pager_argv[] = { NULL, NULL };
static struct child_process pager_process = CHILD_PROCESS_INIT; static struct child_process pager_process = CHILD_PROCESS_INIT;
static void wait_for_pager(void) static void wait_for_pager(void)
@ -70,9 +69,8 @@ void setup_pager(void)
setenv("GIT_PAGER_IN_USE", "true", 1); setenv("GIT_PAGER_IN_USE", "true", 1);
/* spawn the pager */ /* spawn the pager */
pager_argv[0] = pager; argv_array_push(&pager_process.args, pager);
pager_process.use_shell = 1; pager_process.use_shell = 1;
pager_process.argv = pager_argv;
pager_process.in = -1; pager_process.in = -1;
if (!getenv("LESS")) if (!getenv("LESS"))
argv_array_push(&pager_process.env_array, "LESS=FRX"); argv_array_push(&pager_process.env_array, "LESS=FRX");