diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 04:09:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 04:09:55 (GMT) |
| commit | cf0b1793ead9428d88e6592e624c7cb222913c58 (patch) | |
| tree | 13906a437b3a68fdaf9cfa4617280dae44aa41db /environment.c | |
| parent | 5ff42d42da9c2c26737988d19b347c99489c8faa (diff) | |
| parent | 4a7c05f7d7f17cd7a42fa944e79c2ef294cb17b6 (diff) | |
| download | git-cf0b1793ead9428d88e6592e624c7cb222913c58.zip git-cf0b1793ead9428d88e6592e624c7cb222913c58.tar.gz git-cf0b1793ead9428d88e6592e624c7cb222913c58.tar.bz2 | |
Merge branch 'sb/object-store'
Refactoring the internal global data structure to make it possible
to open multiple repositories, work with and then close them.
Rerolled by Duy on top of a separate preliminary clean-up topic.
The resulting structure of the topics looked very sensible.
* sb/object-store: (27 commits)
sha1_file: allow sha1_loose_object_info to handle arbitrary repositories
sha1_file: allow map_sha1_file to handle arbitrary repositories
sha1_file: allow map_sha1_file_1 to handle arbitrary repositories
sha1_file: allow open_sha1_file to handle arbitrary repositories
sha1_file: allow stat_sha1_file to handle arbitrary repositories
sha1_file: allow sha1_file_name to handle arbitrary repositories
sha1_file: add repository argument to sha1_loose_object_info
sha1_file: add repository argument to map_sha1_file
sha1_file: add repository argument to map_sha1_file_1
sha1_file: add repository argument to open_sha1_file
sha1_file: add repository argument to stat_sha1_file
sha1_file: add repository argument to sha1_file_name
sha1_file: allow prepare_alt_odb to handle arbitrary repositories
sha1_file: allow link_alt_odb_entries to handle arbitrary repositories
sha1_file: add repository argument to prepare_alt_odb
sha1_file: add repository argument to link_alt_odb_entries
sha1_file: add repository argument to read_info_alternates
sha1_file: add repository argument to link_alt_odb_entry
sha1_file: add raw_object_store argument to alt_odb_usable
pack: move approximate object count to object store
...
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/environment.c b/environment.c index 21565c3..39b3d90 100644 --- a/environment.c +++ b/environment.c @@ -14,6 +14,7 @@ #include "fmt-merge-msg.h" #include "commit.h" #include "argv-array.h" +#include "object-store.h" int trust_executable_bit = 1; int trust_ctime = 1; @@ -270,9 +271,9 @@ const char *get_git_work_tree(void) char *get_object_directory(void) { - if (!the_repository->objectdir) + if (!the_repository->objects->objectdir) BUG("git environment hasn't been setup"); - return the_repository->objectdir; + return the_repository->objects->objectdir; } int odb_mkstemp(struct strbuf *temp_filename, const char *pattern) |