summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-10 07:28:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-10 07:28:20 (GMT)
commit0873c393c750d32a111ee66ab4ca4d7d21bee0ba (patch)
treea84c74dc4b8084446000913ffe254b33e92dc155 /setup.c
parent62c0fd46a875050e904831a73ef4375ed26cfaf6 (diff)
parent00a3da2a131a3e122df7e053d992fbc1735bf4f9 (diff)
downloadgit-0873c393c750d32a111ee66ab4ca4d7d21bee0ba.zip
git-0873c393c750d32a111ee66ab4ca4d7d21bee0ba.tar.gz
git-0873c393c750d32a111ee66ab4ca4d7d21bee0ba.tar.bz2
Merge branch 'nd/remove-ignore-env-field'
Code clean-up for the "repository" abstraction. * nd/remove-ignore-env-field: repository.h: add comment and clarify repo_set_gitdir repository: delete ignore_env member sha1_file.c: move delayed getenv(altdb) back to setup_git_env() repository.c: delete dead functions repository.c: move env-related setup code back to environment.c repository: initialize the_repository in main()
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/setup.c b/setup.c
index 7287779..664453f 100644
--- a/setup.c
+++ b/setup.c
@@ -1116,8 +1116,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
if (!gitdir)
gitdir = DEFAULT_GIT_DIR_ENVIRONMENT;
- repo_set_gitdir(the_repository, gitdir);
- setup_git_env();
+ setup_git_env(gitdir);
}
if (startup_info->have_repository)
repo_set_hash_algo(the_repository, repo_fmt.hash_algo);