Merge branch 'ps/object-store' into jch

Code clean-up around object access API.

Comments?

* ps/object-store:
  odb: rename `read_object_with_reference()`
  odb: rename `pretend_object_file()`
  odb: rename `has_object()`
  odb: rename `repo_read_object_file()`
  odb: rename `oid_object_info()`
  odb: trivial refactorings to get rid of `the_repository`
  odb: get rid of `the_repository` when handling submodule sources
  odb: get rid of `the_repository` when handling the primary source
  odb: get rid of `the_repository` in `for_each()` functions
  odb: get rid of `the_repository` when handling alternates
  odb: get rid of `the_repository` in `odb_mkstemp()`
  odb: get rid of `the_repository` in `assert_oid_type()`
  odb: get rid of `the_repository` in `find_odb()`
  odb: introduce parent pointers
  object-store: rename files to "odb.{c,h}"
  object-store: rename `object_directory` to `odb_source`
  object-store: rename `raw_object_store` to `object_database`

diff --cc Documentation/user-manual.adoc
Simple merge

diff --cc Makefile
Simple merge

diff --cc builtin/cat-file.c
index 4b23fcecbd8e7ae6bd971e3bcd6266761b1b8a72,08afecbf57cb4bc321ee5601ef6664497f41f464..2492a0b6f39ac3d372850aae66fd23be586c805e
--- 1/builtin/cat-file.c
--- 2/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@@ -489,17 -482,14 +487,17 @@@ static void batch_object_write(const ch
                        data->info.sizep = &data->size;
  
                if (pack)
-                       ret = packed_object_info(the_repository, pack, offset,
-                                                &data->info);
+                       ret = packed_object_info(the_repository, pack,
+                                                offset, &data->info);
                else
-                       ret = oid_object_info_extended(the_repository,
-                                                      &data->oid, &data->info,
-                                                      OBJECT_INFO_LOOKUP_REPLACE);
+                       ret = odb_read_object_info_extended(the_repository->objects,
+                                                           &data->oid, &data->info,
+                                                           OBJECT_INFO_LOOKUP_REPLACE);
                if (ret < 0) {
 -                      report_object_status(opt, obj_name, &data->oid, "missing");
 +                      if (data->mode == S_IFGITLINK)
 +                              report_object_status(opt, oid_to_hex(&data->oid), &data->oid, "submodule");
 +                      else
 +                              report_object_status(opt, obj_name, &data->oid, "missing");
                        return;
                }
  
@@@ -881,9 -870,10 +879,9 @@@ static int batch_objects(struct batch_o
  
        /*
         * Expand once with our special mark_query flag, which will prime the
-        * object_info to be handed to oid_object_info_extended for each
+        * object_info to be handed to odb_read_object_info_extended for each
         * object.
         */
 -      memset(&data, 0, sizeof(data));
        data.mark_query = 1;
        expand_format(&output,
                      opt->format ? opt->format : DEFAULT_FORMAT,

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/commit-graph.c
Simple merge

diff --cc builtin/fast-export.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/gc.c
index 845876ff02869beba3ad7a2ca07fb6cc7f03cc73,ff551fab439a4f39987028ff1f286a142c52f011..21bd44e1645eacda890f059e2b97031d36ef652d
--- 1/builtin/gc.c
--- 2/builtin/gc.c
+++ b/builtin/gc.c
@@@ -1040,8 -1018,8 +1040,8 @@@ int cmd_gc(int argc
        }
  
        if (the_repository->settings.gc_write_commit_graph == 1)
-               write_commit_graph_reachable(the_repository->objects->odb,
+               write_commit_graph_reachable(the_repository->objects->sources,
 -                                           !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
 +                                           !opts.quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
                                             NULL);
  
        if (opts.auto_flag && too_many_loose_objects(&cfg))

diff --cc builtin/log.c
Simple merge

diff --cc builtin/mktag.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/pack-redundant.c
Simple merge

diff --cc builtin/repack.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc bundle-uri.c
Simple merge

diff --cc config.c
Simple merge

diff --cc dir.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc http.c
Simple merge

diff --cc meson.build
Simple merge

diff --cc object-name.c
Simple merge

diff --cc pack-bitmap-write.c
Simple merge

diff --cc pack-bitmap.c
Simple merge

diff --cc pack-objects.h
Simple merge

diff --cc remote.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc submodule-config.c
Simple merge