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
This commit is contained in:
14
connect.c
14
connect.c
@ -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;
|
||||
|
||||
Reference in New Issue
Block a user