diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:02 -0800 |
commit | bd08ecc487f3b515196cc4096094799a02de6ae3 (patch) | |
tree | 920218f73799f6dffcbd1b3bb0d4e878fa449c29 /connect.c | |
parent | 030bc0aa8b012170b69f40f95b152a1080447301 (diff) | |
parent | 5ce9086ddfe6931ef34fcd99778c9235e2ee1839 (diff) | |
download | git-bd08ecc487f3b515196cc4096094799a02de6ae3.tar.gz |
Merge branch 'gb/maint-submodule-env' into maint
* gb/maint-submodule-env:
is_submodule_modified(): clear environment properly
submodules: ensure clean environment when operating in a submodule
shell setup: clear_local_git_env() function
rev-parse: --local-env-vars option
Refactor list of of repo-local env vars
Diffstat (limited to 'connect.c')
-rw-r--r-- | connect.c | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -607,18 +607,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig, *arg++ = host; } else { - /* remove these from the environment */ - const char *env[] = { - ALTERNATE_DB_ENVIRONMENT, - DB_ENVIRONMENT, - GIT_DIR_ENVIRONMENT, - GIT_WORK_TREE_ENVIRONMENT, - GRAFT_ENVIRONMENT, - INDEX_ENVIRONMENT, - NO_REPLACE_OBJECTS_ENVIRONMENT, - NULL - }; - conn->env = env; + /* remove repo-local variables from the environment */ + conn->env = local_repo_env; conn->use_shell = 1; } *arg++ = cmd.buf; |