diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-11 01:04:13 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-11 01:04:13 +0300 |
| commit | c21fa3bb549a7769f9d508f0a5f95c654539e1f7 (patch) | |
| tree | b6998d52e7a03a0aff33d2cdce53a23bfa553996 /submodule.h | |
| parent | 597553e42e816b58cad857d759f11c5f53a01510 (diff) | |
| parent | b3193252c4278e9039fbb896a35f84abc1fb5aac (diff) | |
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 'submodule.h')
| -rw-r--r-- | submodule.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/submodule.h b/submodule.h index 437bc96e05..bfaa9da186 100644 --- a/submodule.h +++ b/submodule.h @@ -158,11 +158,11 @@ int submodule_move_head(const char *path, void submodule_unset_core_worktree(const struct submodule *sub); /* - * Prepare the "env_array" parameter of a "struct child_process" for executing + * Prepare the "env" parameter of a "struct child_process" for executing * a submodule by clearing any repo-specific environment variables, but * retaining any config in the environment. */ -void prepare_submodule_repo_env(struct strvec *out); +void prepare_submodule_repo_env(struct strvec *env); #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0) void absorb_git_dir_into_superproject(const char *path, |