diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-10 15:04:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-10 15:04:13 -0700 |
| commit | c21fa3bb549a7769f9d508f0a5f95c654539e1f7 (patch) | |
| tree | b6998d52e7a03a0aff33d2cdce53a23bfa553996 /pager.c | |
| parent | 597553e42e816b58cad857d759f11c5f53a01510 (diff) | |
| parent | b3193252c4278e9039fbb896a35f84abc1fb5aac (diff) | |
| download | git-c21fa3bb549a7769f9d508f0a5f95c654539e1f7.tar.gz | |
Merge branch 'ab/env-array'
Rename .env_array member to .env in the child_process structure.
* ab/env-array:
run-command API users: use "env" not "env_array" in comments & names
run-command API: rename "env_array" to "env"
Diffstat (limited to 'pager.c')
| -rw-r--r-- | pager.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -99,7 +99,7 @@ void prepare_pager_args(struct child_process *pager_process, const char *pager) { strvec_push(&pager_process->args, pager); pager_process->use_shell = 1; - setup_pager_env(&pager_process->env_array); + setup_pager_env(&pager_process->env); pager_process->trace2_child_class = "pager"; } @@ -129,7 +129,7 @@ void setup_pager(void) /* spawn the pager */ prepare_pager_args(&pager_process, pager); pager_process.in = -1; - strvec_push(&pager_process.env_array, "GIT_PAGER_IN_USE"); + strvec_push(&pager_process.env, "GIT_PAGER_IN_USE"); if (start_command(&pager_process)) return; |