summaryrefslogtreecommitdiff
path: root/t/helper/test-run-command.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-06-02 09:09:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-06-02 21:31:16 (GMT)
commit29fda24dd11e90583f3ea9ff2f90ee9acacd7792 (patch)
tree392cb2d6d8bc054c3f6101714dd61ce36a6239ff /t/helper/test-run-command.c
parent07330a41d66a2c9589b585a3a24ecdcf19994f19 (diff)
downloadgit-29fda24dd11e90583f3ea9ff2f90ee9acacd7792.zip
git-29fda24dd11e90583f3ea9ff2f90ee9acacd7792.tar.gz
git-29fda24dd11e90583f3ea9ff2f90ee9acacd7792.tar.bz2
run-command API: rename "env_array" to "env"
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 <contrib/coccinelle/run_command.cocci.patch * git add -u 1. cat contrib/coccinelle/run_command.pending.cocci @@ struct child_process E; @@ - E.env_array + E.env @@ struct child_process *E; @@ - E->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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper/test-run-command.c')
-rw-r--r--t/helper/test-run-command.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index f3b90aa..9050e31 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -390,7 +390,7 @@ int cmd__run_command(int argc, const char **argv)
while (!strcmp(argv[1], "env")) {
if (!argv[2])
die("env specifier without a value");
- strvec_push(&proc.env_array, argv[2]);
+ strvec_push(&proc.env, argv[2]);
argv += 2;
argc -= 2;
}