summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-07 20:47:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-07 20:47:17 (GMT)
commit9317dc4f051452a0e0f7a62a5531b16adf36b553 (patch)
tree0ef09fc4b06b1721faa516a302e18a8c5baf887a /connect.c
parent27a23031056fbd540f7c34d78a3f097a3a7c211c (diff)
parent5ce9086ddfe6931ef34fcd99778c9235e2ee1839 (diff)
downloadgit-9317dc4f051452a0e0f7a62a5531b16adf36b553.zip
git-9317dc4f051452a0e0f7a62a5531b16adf36b553.tar.gz
git-9317dc4f051452a0e0f7a62a5531b16adf36b553.tar.bz2
Merge branch 'gb/maint-submodule-env'
* 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.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/connect.c b/connect.c
index 9f39038..323a771 100644
--- a/connect.c
+++ b/connect.c
@@ -582,18 +582,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;