diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-10 10:28:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-10 10:28:20 +0300 |
| commit | 0873c393c750d32a111ee66ab4ca4d7d21bee0ba (patch) | |
| tree | a84c74dc4b8084446000913ffe254b33e92dc155 /sha1_file.c | |
| parent | 62c0fd46a875050e904831a73ef4375ed26cfaf6 (diff) | |
| parent | 00a3da2a131a3e122df7e053d992fbc1735bf4f9 (diff) | |
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 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sha1_file.c b/sha1_file.c index 1c61d9d927..aea9124a78 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -668,15 +668,11 @@ int foreach_alt_odb(alt_odb_fn fn, void *cb) void prepare_alt_odb(void) { - const char *alt; - if (alt_odb_tail) return; - alt = getenv(ALTERNATE_DB_ENVIRONMENT); - alt_odb_tail = &alt_odb_list; - link_alt_odb_entries(alt, PATH_SEP, NULL, 0); + link_alt_odb_entries(the_repository->alternate_db, PATH_SEP, NULL, 0); read_info_alternates(get_object_directory(), 0); } |