diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2021-06-17 17:13:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-28 16:57:54 (GMT) |
| commit | 69bb2e1804d2f3e5ba7ef365fdfd1937b4d7ca0a (patch) | |
| tree | fe03b124adc572924ed6df2d31242e187af49b9b /submodule.c | |
| parent | ef7dc2e9ccb832c1dc29d5102c09f6c4a51d4dca (diff) | |
| download | git-69bb2e1804d2f3e5ba7ef365fdfd1937b4d7ca0a.zip git-69bb2e1804d2f3e5ba7ef365fdfd1937b4d7ca0a.tar.gz git-69bb2e1804d2f3e5ba7ef365fdfd1937b4d7ca0a.tar.bz2 | |
submodule: refrain from filtering GIT_CONFIG_COUNT
14111fc492 ("git: submodule honor -c credential.* from command line",
2016-03-01) taught Git to pass through the GIT_CONFIG_PARAMETERS
environment variable when invoking a subprocess on behalf of a
submodule. But when d8d77153ea ("config: allow specifying config entries
via envvar pairs", 2021-01-15) introduced support for GIT_CONFIG_COUNT
(and its associated GIT_CONFIG_KEY_? and GIT_CONFIG_VALUE_?), the
subprocess mechanism wasn't updated to also pass through these
variables.
Since they are conceptually the same (d8d77153ea was written to address
a shortcoming of GIT_CONFIG_PARAMETERS), update the submodule subprocess
mechanism to also pass through GIT_CONFIG_COUNT.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 0b1d9c1..f09031e 100644 --- a/submodule.c +++ b/submodule.c @@ -489,7 +489,8 @@ static void prepare_submodule_repo_env_no_git_dir(struct strvec *out) const char * const *var; for (var = local_repo_env; *var; var++) { - if (strcmp(*var, CONFIG_DATA_ENVIRONMENT)) + if (strcmp(*var, CONFIG_DATA_ENVIRONMENT) && + strcmp(*var, CONFIG_COUNT_ENVIRONMENT)) strvec_push(out, *var); } } |