diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:25 -0700 |
| commit | e059388fb200fb2b5281ce211242ef3525a9c2c7 (patch) | |
| tree | 6cfe78227a92d42cce7c5c34521750af249766e0 /git-submodule.sh | |
| parent | Merge branch 'nd/remote-plural-ours-plus-theirs' (diff) | |
| parent | submodule: stop sanitizing config options (diff) | |
| download | tgif-e059388fb200fb2b5281ce211242ef3525a9c2c7.tar.xz | |
Merge branch 'jk/submodule-c-credential'
An earlier addition of "sanitize_submodule_env" with 14111fc4 (git:
submodule honor -c credential.* from command line, 2016-02-29)
turned out to be a convoluted no-op; implement what it wanted to do
correctly, and stop filtering settings given via "git -c var=val".
* jk/submodule-c-credential:
submodule: stop sanitizing config options
submodule: use prepare_submodule_repo_env consistently
submodule--helper: move config-sanitizing to submodule.c
submodule: export sanitized GIT_CONFIG_PARAMETERS
t5550: break submodule config test into multiple sub-tests
t5550: fix typo in $HTTPD_URL
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 72fa391283..5a4dec050b 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -124,9 +124,10 @@ isnumber() # of the settings from GIT_CONFIG_PARAMETERS. sanitize_submodule_env() { - sanitized_config=$(git submodule--helper sanitize-config) + save_config=$GIT_CONFIG_PARAMETERS clear_local_git_env - GIT_CONFIG_PARAMETERS=$sanitized_config + GIT_CONFIG_PARAMETERS=$save_config + export GIT_CONFIG_PARAMETERS } # |