From 29fda24dd11e90583f3ea9ff2f90ee9acacd7792 Mon Sep 17 00:00:00 2001 From: Ævar Arnfjörð Bjarmason Date: Thu, 2 Jun 2022 11:09:50 +0200 Subject: run-command API: rename "env_array" to "env" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Start following-up on the rename mentioned in c7c4bdeccf3 (run-command API: remove "env" member, always use "env_array", 2021-11-25) of "env_array" to "env". The "env_array" name was picked in 19a583dc39e (run-command: add env_array, an optional argv_array for env, 2014-10-19) because "env" was taken. Let's not forever keep the oddity of "*_array" for this "struct strvec", but not for its "args" sibling. This commit is almost entirely made with a coccinelle rule[1]. The only manual change here is in run-command.h to rename the struct member itself and to change "env_array" to "env" in the CHILD_PROCESS_INIT initializer. The rest of this is all a result of applying [1]: * make contrib/coccinelle/run_command.cocci.patch * patch -p1 env_array + E->env I've avoided changing any comments and derived variable names here, that will all be done in the next commit. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- connected.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'connected.c') diff --git a/connected.c b/connected.c index ed3025e7a2..74a20cb32e 100644 --- a/connected.c +++ b/connected.c @@ -110,7 +110,7 @@ no_promisor_pack_found: rev_list.git_cmd = 1; if (opt->env) - strvec_pushv(&rev_list.env_array, opt->env); + strvec_pushv(&rev_list.env, opt->env); rev_list.in = -1; rev_list.no_stdout = 1; if (opt->err_fd) -- cgit v1.2.3