@matheusbsbs / matheus-bagliano / commits / 8f49151763

object-store: rename files to "odb.{c,h}"

In the preceding commits we have renamed the structures contained in "object-store.h" to `struct object_database` and `struct odb_backend`. As such, the code files "object-store.{c,h}" are confusingly named now. Rename them to "odb.{c,h}" accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Jul 1, 2025 at 14:22 UTC 8f49151763cb81adf4bcec53c1ae67057081b02d
126 files changed +129 -129
Makefile
+1 -1
@@ -1085,8 +1085,8 @@ LIB_OBJS += notes.o
1085 LIB_OBJS += object-file-convert.o
1086 LIB_OBJS += object-file.o
1087 LIB_OBJS += object-name.o
1088 -LIB_OBJS += object-store.o
1088 LIB_OBJS += object.o
1089 +LIB_OBJS += odb.o
1090 LIB_OBJS += oid-array.o
1091 LIB_OBJS += oidmap.o
1092 LIB_OBJS += oidset.o
apply.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "abspath.h"
15 #include "base85.h"
16 #include "config.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "delta.h"
19 #include "diff.h"
20 #include "dir.h"
archive-tar.c
+1 -1
@@ -11,7 +11,7 @@
11 #include "hex.h"
12 #include "tar.h"
13 #include "archive.h"
14 -#include "object-store.h"
14 +#include "odb.h"
15 #include "strbuf.h"
16 #include "streaming.h"
17 #include "run-command.h"
archive-zip.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "hex.h"
13 #include "streaming.h"
14 #include "utf8.h"
15 -#include "object-store.h"
15 +#include "odb.h"
16 #include "strbuf.h"
17 #include "userdiff.h"
18 #include "write-or-die.h"
archive.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "pretty.h"
15 #include "setup.h"
16 #include "refs.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "commit.h"
19 #include "tree.h"
20 #include "tree-walk.h"
attr.c
+1 -1
@@ -22,7 +22,7 @@
22 #include "read-cache-ll.h"
23 #include "refs.h"
24 #include "revision.h"
25 -#include "object-store.h"
25 +#include "odb.h"
26 #include "setup.h"
27 #include "thread-utils.h"
28 #include "tree-walk.h"
bisect.c
+1 -1
@@ -20,7 +20,7 @@
20 #include "commit-slab.h"
21 #include "commit-reach.h"
22 #include "object-name.h"
23 -#include "object-store.h"
23 +#include "odb.h"
24 #include "path.h"
25 #include "dir.h"
26
blame.c
+1 -1
@@ -3,7 +3,7 @@
3
4 #include "git-compat-util.h"
5 #include "refs.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "cache-tree.h"
8 #include "mergesort.h"
9 #include "commit.h"
builtin/backfill.c
+1 -1
@@ -13,7 +13,7 @@
13 #include "tree.h"
14 #include "tree-walk.h"
15 #include "object.h"
16 -#include "object-store.h"
16 +#include "odb.h"
17 #include "oid-array.h"
18 #include "oidset.h"
19 #include "promisor-remote.h"
builtin/blame.c
+1 -1
@@ -28,7 +28,7 @@
28 #include "line-log.h"
29 #include "progress.h"
30 #include "object-name.h"
31 -#include "object-store.h"
31 +#include "odb.h"
32 #include "pager.h"
33 #include "blame.h"
34 #include "refs.h"
builtin/cat-file.c
+1 -1
@@ -24,7 +24,7 @@
24 #include "pack-bitmap.h"
25 #include "object-file.h"
26 #include "object-name.h"
27 -#include "object-store.h"
27 +#include "odb.h"
28 #include "replace-object.h"
29 #include "promisor-remote.h"
30 #include "mailmap.h"
builtin/checkout.c
+1 -1
@@ -20,7 +20,7 @@
20 #include "merge-ort-wrappers.h"
21 #include "object-file.h"
22 #include "object-name.h"
23 -#include "object-store.h"
23 +#include "odb.h"
24 #include "parse-options.h"
25 #include "path.h"
26 #include "preload-index.h"
builtin/clone.c
+1 -1
@@ -25,7 +25,7 @@
25 #include "refs.h"
26 #include "refspec.h"
27 #include "object-file.h"
28 -#include "object-store.h"
28 +#include "odb.h"
29 #include "tree.h"
30 #include "tree-walk.h"
31 #include "unpack-trees.h"
builtin/commit-graph.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "hex.h"
7 #include "parse-options.h"
8 #include "commit-graph.h"
9 -#include "object-store.h"
9 +#include "odb.h"
10 #include "progress.h"
11 #include "replace-object.h"
12 #include "strbuf.h"
builtin/commit-tree.c
+1 -1
@@ -9,7 +9,7 @@
9 #include "gettext.h"
10 #include "hex.h"
11 #include "object-name.h"
12 -#include "object-store.h"
12 +#include "odb.h"
13
14 #include "commit.h"
15 #include "parse-options.h"
builtin/describe.c
+1 -1
@@ -19,7 +19,7 @@
19 #include "setup.h"
20 #include "strvec.h"
21 #include "run-command.h"
22 -#include "object-store.h"
22 +#include "odb.h"
23 #include "list-objects.h"
24 #include "commit-slab.h"
25 #include "wildmatch.h"
builtin/difftool.c
+1 -1
@@ -30,7 +30,7 @@
30 #include "strbuf.h"
31 #include "lockfile.h"
32 #include "object-file.h"
33 -#include "object-store.h"
33 +#include "odb.h"
34 #include "dir.h"
35 #include "entry.h"
36 #include "setup.h"
builtin/fast-export.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "refs.h"
15 #include "refspec.h"
16 #include "object-file.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "commit.h"
19 #include "object.h"
20 #include "tag.h"
builtin/fast-import.c
+1 -1
@@ -24,7 +24,7 @@
24 #include "packfile.h"
25 #include "object-file.h"
26 #include "object-name.h"
27 -#include "object-store.h"
27 +#include "odb.h"
28 #include "mem-pool.h"
29 #include "commit-reach.h"
30 #include "khash.h"
builtin/fetch.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "refs.h"
15 #include "refspec.h"
16 #include "object-name.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "oidset.h"
19 #include "oid-array.h"
20 #include "commit.h"
builtin/fsck.c
+1 -1
@@ -17,7 +17,7 @@
17 #include "packfile.h"
18 #include "object-file.h"
19 #include "object-name.h"
20 -#include "object-store.h"
20 +#include "odb.h"
21 #include "path.h"
22 #include "read-cache-ll.h"
23 #include "replace-object.h"
builtin/grep.c
+1 -1
@@ -26,7 +26,7 @@
26 #include "submodule-config.h"
27 #include "object-file.h"
28 #include "object-name.h"
29 -#include "object-store.h"
29 +#include "odb.h"
30 #include "packfile.h"
31 #include "pager.h"
32 #include "path.h"
builtin/hash-object.c
+1 -1
@@ -11,7 +11,7 @@
11 #include "gettext.h"
12 #include "hex.h"
13 #include "object-file.h"
14 -#include "object-store.h"
14 +#include "odb.h"
15 #include "blob.h"
16 #include "quote.h"
17 #include "parse-options.h"
builtin/index-pack.c
+1 -1
@@ -21,7 +21,7 @@
21 #include "packfile.h"
22 #include "pack-revindex.h"
23 #include "object-file.h"
24 -#include "object-store.h"
24 +#include "odb.h"
25 #include "oid-array.h"
26 #include "oidset.h"
27 #include "path.h"
builtin/log.c
+1 -1
@@ -15,7 +15,7 @@
15 #include "hex.h"
16 #include "refs.h"
17 #include "object-name.h"
18 -#include "object-store.h"
18 +#include "odb.h"
19 #include "pager.h"
20 #include "color.h"
21 #include "commit.h"
builtin/ls-files.c
+1 -1
@@ -25,7 +25,7 @@
25 #include "setup.h"
26 #include "sparse-index.h"
27 #include "submodule.h"
28 -#include "object-store.h"
28 +#include "odb.h"
29 #include "hex.h"
30
31
builtin/ls-tree.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "gettext.h"
11 #include "hex.h"
12 #include "object-name.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14 #include "tree.h"
15 #include "path.h"
16 #include "quote.h"
builtin/merge-file.c
+1 -1
@@ -7,7 +7,7 @@
7 #include "hex.h"
8 #include "object-file.h"
9 #include "object-name.h"
10 -#include "object-store.h"
10 +#include "odb.h"
11 #include "config.h"
12 #include "gettext.h"
13 #include "setup.h"
builtin/merge-tree.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "commit-reach.h"
11 #include "merge-ort.h"
12 #include "object-name.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14 #include "parse-options.h"
15 #include "blob.h"
16 #include "merge-blobs.h"
builtin/mktag.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "strbuf.h"
7 #include "replace-object.h"
8 #include "object-file.h"
9 -#include "object-store.h"
9 +#include "odb.h"
10 #include "fsck.h"
11 #include "config.h"
12
builtin/mktree.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "tree.h"
13 #include "parse-options.h"
14 #include "object-file.h"
15 -#include "object-store.h"
15 +#include "odb.h"
16
17 static struct treeent {
18 unsigned mode;
builtin/multi-pack-index.c
+1 -1
@@ -7,7 +7,7 @@
7 #include "midx.h"
8 #include "strbuf.h"
9 #include "trace2.h"
10 -#include "object-store.h"
10 +#include "odb.h"
11 #include "replace-object.h"
12 #include "repository.h"
13
builtin/notes.c
+1 -1
@@ -16,7 +16,7 @@
16 #include "notes.h"
17 #include "object-file.h"
18 #include "object-name.h"
19 -#include "object-store.h"
19 +#include "odb.h"
20 #include "path.h"
21
22 #include "pretty.h"
builtin/pack-objects.c
+1 -1
@@ -32,7 +32,7 @@
32 #include "list.h"
33 #include "packfile.h"
34 #include "object-file.h"
35 -#include "object-store.h"
35 +#include "odb.h"
36 #include "replace-object.h"
37 #include "dir.h"
38 #include "midx.h"
builtin/pack-redundant.c
+1 -1
@@ -13,7 +13,7 @@
13 #include "hex.h"
14
15 #include "packfile.h"
16 -#include "object-store.h"
16 +#include "odb.h"
17 #include "strbuf.h"
18
19 #define BLKSIZE 512
builtin/prune.c
+1 -1
@@ -17,7 +17,7 @@
17 #include "replace-object.h"
18 #include "object-file.h"
19 #include "object-name.h"
20 -#include "object-store.h"
20 +#include "odb.h"
21 #include "shallow.h"
22
23 static const char * const prune_usage[] = {
builtin/receive-pack.c
+1 -1
@@ -33,7 +33,7 @@
33 #include "packfile.h"
34 #include "object-file.h"
35 #include "object-name.h"
36 -#include "object-store.h"
36 +#include "odb.h"
37 #include "path.h"
38 #include "protocol.h"
39 #include "commit-reach.h"
builtin/remote.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "rebase.h"
15 #include "refs.h"
16 #include "refspec.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "strvec.h"
19 #include "commit-reach.h"
20 #include "progress.h"
builtin/repack.c
+1 -1
@@ -17,7 +17,7 @@
17 #include "midx.h"
18 #include "packfile.h"
19 #include "prune-packed.h"
20 -#include "object-store.h"
20 +#include "odb.h"
21 #include "promisor-remote.h"
22 #include "shallow.h"
23 #include "pack.h"
builtin/replace.c
+1 -1
@@ -19,7 +19,7 @@
19 #include "run-command.h"
20 #include "object-file.h"
21 #include "object-name.h"
22 -#include "object-store.h"
22 +#include "odb.h"
23 #include "replace-object.h"
24 #include "tag.h"
25 #include "wildmatch.h"
builtin/rev-list.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "object.h"
15 #include "object-name.h"
16 #include "object-file.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "pack-bitmap.h"
19 #include "parse-options.h"
20 #include "log-tree.h"
builtin/show-ref.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "hex.h"
6 #include "refs/refs-internal.h"
7 #include "object-name.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "object.h"
10 #include "string-list.h"
11 #include "parse-options.h"
builtin/submodule--helper.c
+1 -1
@@ -28,7 +28,7 @@
28 #include "diff.h"
29 #include "object-file.h"
30 #include "object-name.h"
31 -#include "object-store.h"
31 +#include "odb.h"
32 #include "advice.h"
33 #include "branch.h"
34 #include "list-objects-filter-options.h"
builtin/tag.c
+1 -1
@@ -19,7 +19,7 @@
19 #include "refs.h"
20 #include "object-file.h"
21 #include "object-name.h"
22 -#include "object-store.h"
22 +#include "odb.h"
23 #include "path.h"
24 #include "tag.h"
25 #include "parse-options.h"
builtin/unpack-file.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "hex.h"
5 #include "object-file.h"
6 #include "object-name.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8
9 static char *create_temp_file(struct object_id *oid)
10 {
builtin/unpack-objects.c
+1 -1
@@ -9,7 +9,7 @@
9 #include "git-zlib.h"
10 #include "hex.h"
11 #include "object-file.h"
12 -#include "object-store.h"
12 +#include "odb.h"
13 #include "object.h"
14 #include "delta.h"
15 #include "pack.h"
bulk-checkin.c
+1 -1
@@ -17,7 +17,7 @@
17 #include "tmp-objdir.h"
18 #include "packfile.h"
19 #include "object-file.h"
20 -#include "object-store.h"
20 +#include "odb.h"
21
22 static int odb_transaction_nesting;
23
bundle-uri.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "fetch-pack.h"
15 #include "remote.h"
16 #include "trace2.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18
19 static struct {
20 enum bundle_list_heuristic heuristic;
bundle.c
+1 -1
@@ -7,7 +7,7 @@
7 #include "environment.h"
8 #include "gettext.h"
9 #include "hex.h"
10 -#include "object-store.h"
10 +#include "odb.h"
11 #include "repository.h"
12 #include "object.h"
13 #include "commit.h"
cache-tree.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "cache-tree.h"
11 #include "bulk-checkin.h"
12 #include "object-file.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14 #include "read-cache-ll.h"
15 #include "replace-object.h"
16 #include "repository.h"
combine-diff.c
+1 -1
@@ -2,7 +2,7 @@
2 #define DISABLE_SIGN_COMPARE_WARNINGS
3
4 #include "git-compat-util.h"
5 -#include "object-store.h"
5 +#include "odb.h"
6 #include "commit.h"
7 #include "convert.h"
8 #include "diff.h"
commit-graph.c
+1 -1
@@ -13,7 +13,7 @@
13 #include "refs.h"
14 #include "hash-lookup.h"
15 #include "commit-graph.h"
16 -#include "object-store.h"
16 +#include "odb.h"
17 #include "oid-array.h"
18 #include "path.h"
19 #include "alloc.h"
commit-graph.h
+1 -1
@@ -1,7 +1,7 @@
1 #ifndef COMMIT_GRAPH_H
2 #define COMMIT_GRAPH_H
3
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "oidset.h"
6
7 #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"
commit.c
+1 -1
@@ -9,7 +9,7 @@
9 #include "hex.h"
10 #include "repository.h"
11 #include "object-name.h"
12 -#include "object-store.h"
12 +#include "odb.h"
13 #include "utf8.h"
14 #include "diff.h"
15 #include "revision.h"
config.c
+1 -1
@@ -31,7 +31,7 @@
31 #include "hashmap.h"
32 #include "string-list.h"
33 #include "object-name.h"
34 -#include "object-store.h"
34 +#include "odb.h"
35 #include "pager.h"
36 #include "path.h"
37 #include "utf8.h"
connected.c
+1 -1
@@ -3,7 +3,7 @@
3 #include "git-compat-util.h"
4 #include "gettext.h"
5 #include "hex.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "run-command.h"
8 #include "sigchain.h"
9 #include "connected.h"
contrib/coccinelle/the_repository.cocci
+1 -1
@@ -77,7 +77,7 @@
77 |
78 - diff_setup
79 + repo_diff_setup
80 -// object-store.h
80 +// odb.h
81 |
82 - read_object_file
83 + repo_read_object_file
diagnose.c
+1 -1
@@ -7,7 +7,7 @@
7 #include "gettext.h"
8 #include "hex.h"
9 #include "strvec.h"
10 -#include "object-store.h"
10 +#include "odb.h"
11 #include "packfile.h"
12 #include "parse-options.h"
13 #include "repository.h"
diff.c
+1 -1
@@ -23,7 +23,7 @@
23 #include "color.h"
24 #include "run-command.h"
25 #include "utf8.h"
26 -#include "object-store.h"
26 +#include "odb.h"
27 #include "userdiff.h"
28 #include "submodule.h"
29 #include "hashmap.h"
entry.c
+1 -1
@@ -1,7 +1,7 @@
1 #define USE_THE_REPOSITORY_VARIABLE
2
3 #include "git-compat-util.h"
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "dir.h"
6 #include "environment.h"
7 #include "gettext.h"
fetch-pack.c
+1 -1
@@ -24,7 +24,7 @@
24 #include "oid-array.h"
25 #include "oidset.h"
26 #include "packfile.h"
27 -#include "object-store.h"
27 +#include "odb.h"
28 #include "path.h"
29 #include "connected.h"
30 #include "fetch-negotiator.h"
fmt-merge-msg.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "environment.h"
7 #include "refs.h"
8 #include "object-name.h"
9 -#include "object-store.h"
9 +#include "odb.h"
10 #include "diff.h"
11 #include "diff-merges.h"
12 #include "hex.h"
fsck.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "date.h"
5 #include "dir.h"
6 #include "hex.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8 #include "path.h"
9 #include "repository.h"
10 #include "object.h"
grep.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "gettext.h"
6 #include "grep.h"
7 #include "hex.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "pretty.h"
10 #include "userdiff.h"
11 #include "xdiff-interface.h"
http-backend.c
+1 -1
@@ -18,7 +18,7 @@
18 #include "url.h"
19 #include "strvec.h"
20 #include "packfile.h"
21 -#include "object-store.h"
21 +#include "odb.h"
22 #include "protocol.h"
23 #include "date.h"
24 #include "write-or-die.h"
http-push.c
+1 -1
@@ -20,7 +20,7 @@
20 #include "url.h"
21 #include "packfile.h"
22 #include "object-file.h"
23 -#include "object-store.h"
23 +#include "odb.h"
24 #include "commit-reach.h"
25
26 #ifdef EXPAT_NEEDS_XMLPARSE_H
http-walker.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "transport.h"
11 #include "packfile.h"
12 #include "object-file.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14
15 struct alt_base {
16 char *base;
http.c
+1 -1
@@ -19,7 +19,7 @@
19 #include "packfile.h"
20 #include "string-list.h"
21 #include "object-file.h"
22 -#include "object-store.h"
22 +#include "odb.h"
23 #include "tempfile.h"
24
25 static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
list-objects-filter.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "oidmap.h"
13 #include "oidset.h"
14 #include "object-name.h"
15 -#include "object-store.h"
15 +#include "odb.h"
16
17 /* Remember to update object flag allocation in object.h */
18 /*
list-objects.c
+1 -1
@@ -14,7 +14,7 @@
14 #include "list-objects-filter.h"
15 #include "list-objects-filter-options.h"
16 #include "packfile.h"
17 -#include "object-store.h"
17 +#include "odb.h"
18 #include "trace.h"
19 #include "environment.h"
20
loose.c
+1 -1
@@ -1,7 +1,7 @@
1 #include "git-compat-util.h"
2 #include "hash.h"
3 #include "path.h"
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "hex.h"
6 #include "repository.h"
7 #include "wrapper.h"
mailmap.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "string-list.h"
7 #include "mailmap.h"
8 #include "object-name.h"
9 -#include "object-store.h"
9 +#include "odb.h"
10 #include "setup.h"
11
12 char *git_mailmap_file;
match-trees.c
+1 -1
@@ -7,7 +7,7 @@
7 #include "tree.h"
8 #include "tree-walk.h"
9 #include "object-file.h"
10 -#include "object-store.h"
10 +#include "odb.h"
11 #include "repository.h"
12
13 static int score_missing(unsigned mode)
merge-blobs.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "merge-ll.h"
5 #include "blob.h"
6 #include "merge-blobs.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8
9 static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
10 {
merge-ort.c
+1 -1
@@ -39,7 +39,7 @@
39 #include "mem-pool.h"
40 #include "object-file.h"
41 #include "object-name.h"
42 -#include "object-store.h"
42 +#include "odb.h"
43 #include "oid-array.h"
44 #include "path.h"
45 #include "promisor-remote.h"
meson.build
+1 -1
@@ -396,8 +396,8 @@ libgit_sources = [
396 'object-file-convert.c',
397 'object-file.c',
398 'object-name.c',
399 - 'object-store.c',
399 'object.c',
400 + 'odb.c',
401 'oid-array.c',
402 'oidmap.c',
403 'oidset.c',
notes-cache.c
+1 -1
@@ -3,7 +3,7 @@
3 #include "git-compat-util.h"
4 #include "notes-cache.h"
5 #include "object-file.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "pretty.h"
8 #include "repository.h"
9 #include "commit.h"
notes-merge.c
+1 -1
@@ -8,7 +8,7 @@
8 #include "refs.h"
9 #include "object-file.h"
10 #include "object-name.h"
11 -#include "object-store.h"
11 +#include "odb.h"
12 #include "path.h"
13 #include "repository.h"
14 #include "diff.h"
notes.c
+1 -1
@@ -8,7 +8,7 @@
8 #include "notes.h"
9 #include "object-file.h"
10 #include "object-name.h"
11 -#include "object-store.h"
11 +#include "odb.h"
12 #include "utf8.h"
13 #include "strbuf.h"
14 #include "tree-walk.h"
object-file.c
+1 -1
@@ -21,7 +21,7 @@
21 #include "loose.h"
22 #include "object-file-convert.h"
23 #include "object-file.h"
24 -#include "object-store.h"
24 +#include "odb.h"
25 #include "oidtree.h"
26 #include "pack.h"
27 #include "packfile.h"
object-file.h
+1 -1
@@ -3,7 +3,7 @@
3
4 #include "git-zlib.h"
5 #include "object.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7
8 struct index_state;
9
odb.c renamed
+1 -1
@@ -13,7 +13,7 @@
13 #include "loose.h"
14 #include "object-file-convert.h"
15 #include "object-file.h"
16 -#include "object-store.h"
16 +#include "odb.h"
17 #include "packfile.h"
18 #include "path.h"
19 #include "promisor-remote.h"
odb.h renamed
+3 -3
@@ -1,5 +1,5 @@
1 -#ifndef OBJECT_STORE_H
2 -#define OBJECT_STORE_H
1 +#ifndef ODB_H
2 +#define ODB_H
3
4 #include "hashmap.h"
5 #include "object.h"
@@ -352,4 +352,4 @@ void *read_object_with_reference(struct repository *r,
352 unsigned long *size,
353 struct object_id *oid_ret);
354
355 -#endif /* OBJECT_STORE_H */
355 +#endif /* ODB_H */
oss-fuzz/fuzz-pack-idx.c
+1 -1
@@ -1,5 +1,5 @@
1 #include "git-compat-util.h"
2 -#include "object-store.h"
2 +#include "odb.h"
3 #include "packfile.h"
4
5 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
pack-bitmap-write.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "environment.h"
5 #include "gettext.h"
6 #include "hex.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8 #include "commit.h"
9 #include "diff.h"
10 #include "revision.h"
pack-bitmap.c
+1 -1
@@ -17,7 +17,7 @@
17 #include "packfile.h"
18 #include "repository.h"
19 #include "trace2.h"
20 -#include "object-store.h"
20 +#include "odb.h"
21 #include "list-objects-filter-options.h"
22 #include "midx.h"
23 #include "config.h"
pack-check.c
+1 -1
@@ -8,7 +8,7 @@
8 #include "progress.h"
9 #include "packfile.h"
10 #include "object-file.h"
11 -#include "object-store.h"
11 +#include "odb.h"
12
13 struct idx_entry {
14 off_t offset;
pack-mtimes.c
+1 -1
@@ -1,7 +1,7 @@
1 #include "git-compat-util.h"
2 #include "gettext.h"
3 #include "pack-mtimes.h"
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "packfile.h"
6 #include "strbuf.h"
7
pack-objects.h
+1 -1
@@ -1,7 +1,7 @@
1 #ifndef PACK_OBJECTS_H
2 #define PACK_OBJECTS_H
3
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "thread-utils.h"
6 #include "pack.h"
7 #include "packfile.h"
pack-revindex.c
+1 -1
@@ -1,7 +1,7 @@
1 #include "git-compat-util.h"
2 #include "gettext.h"
3 #include "pack-revindex.h"
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "packfile.h"
6 #include "strbuf.h"
7 #include "trace2.h"
packfile.c
+1 -1
@@ -19,7 +19,7 @@
19 #include "tree-walk.h"
20 #include "tree.h"
21 #include "object-file.h"
22 -#include "object-store.h"
22 +#include "odb.h"
23 #include "midx.h"
24 #include "commit-graph.h"
25 #include "pack-revindex.h"
packfile.h
+2 -2
@@ -3,10 +3,10 @@
3
4 #include "list.h"
5 #include "object.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "oidset.h"
8
9 -/* in object-store.h */
9 +/* in odb.h */
10 struct object_info;
11
12 struct packed_git {
path.c
+1 -1
@@ -15,7 +15,7 @@
15 #include "submodule-config.h"
16 #include "path.h"
17 #include "packfile.h"
18 -#include "object-store.h"
18 +#include "odb.h"
19 #include "lockfile.h"
20 #include "exec-cmd.h"
21
promisor-remote.c
+1 -1
@@ -3,7 +3,7 @@
3 #include "git-compat-util.h"
4 #include "gettext.h"
5 #include "hex.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "promisor-remote.h"
8 #include "config.h"
9 #include "trace2.h"
protocol-caps.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "hash.h"
7 #include "hex.h"
8 #include "object.h"
9 -#include "object-store.h"
9 +#include "odb.h"
10 #include "repository.h"
11 #include "string-list.h"
12 #include "strbuf.h"
read-cache.c
+1 -1
@@ -20,7 +20,7 @@
20 #include "refs.h"
21 #include "dir.h"
22 #include "object-file.h"
23 -#include "object-store.h"
23 +#include "odb.h"
24 #include "oid-array.h"
25 #include "tree.h"
26 #include "commit.h"
ref-filter.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "refs.h"
13 #include "wildmatch.h"
14 #include "object-name.h"
15 -#include "object-store.h"
15 +#include "odb.h"
16 #include "oid-array.h"
17 #include "repo-settings.h"
18 #include "repository.h"
reflog.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "config.h"
6 #include "gettext.h"
7 #include "parse-options.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "reflog.h"
10 #include "refs.h"
11 #include "revision.h"
refs.c
+1 -1
@@ -19,7 +19,7 @@
19 #include "run-command.h"
20 #include "hook.h"
21 #include "object-name.h"
22 -#include "object-store.h"
22 +#include "odb.h"
23 #include "object.h"
24 #include "path.h"
25 #include "submodule.h"
remote.c
+1 -1
@@ -12,7 +12,7 @@
12 #include "refs.h"
13 #include "refspec.h"
14 #include "object-name.h"
15 -#include "object-store.h"
15 +#include "odb.h"
16 #include "path.h"
17 #include "commit.h"
18 #include "diff.h"
replace-object.c
+1 -1
@@ -2,7 +2,7 @@
2 #include "gettext.h"
3 #include "hex.h"
4 #include "oidmap.h"
5 -#include "object-store.h"
5 +#include "odb.h"
6 #include "replace-object.h"
7 #include "refs.h"
8 #include "repository.h"
replace-object.h
+1 -1
@@ -3,7 +3,7 @@
3
4 #include "oidmap.h"
5 #include "repository.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7
8 struct replace_object {
9 struct oidmap_entry original;
repository.c
+1 -1
@@ -1,7 +1,7 @@
1 #include "git-compat-util.h"
2 #include "abspath.h"
3 #include "repository.h"
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "config.h"
6 #include "object.h"
7 #include "lockfile.h"
rerere.c
+1 -1
@@ -18,7 +18,7 @@
18 #include "path.h"
19 #include "pathspec.h"
20 #include "object-file.h"
21 -#include "object-store.h"
21 +#include "odb.h"
22 #include "strmap.h"
23
24 #define RESOLVED 0
revision.c
+1 -1
@@ -8,7 +8,7 @@
8 #include "hex.h"
9 #include "object-name.h"
10 #include "object-file.h"
11 -#include "object-store.h"
11 +#include "odb.h"
12 #include "oidset.h"
13 #include "tag.h"
14 #include "blob.h"
send-pack.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "date.h"
5 #include "gettext.h"
6 #include "hex.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8 #include "pkt-line.h"
9 #include "sideband.h"
10 #include "run-command.h"
sequencer.c
+1 -1
@@ -13,7 +13,7 @@
13 #include "dir.h"
14 #include "object-file.h"
15 #include "object-name.h"
16 -#include "object-store.h"
16 +#include "odb.h"
17 #include "object.h"
18 #include "pager.h"
19 #include "commit.h"
server-info.c
+1 -1
@@ -11,7 +11,7 @@
11 #include "packfile.h"
12 #include "path.h"
13 #include "object-file.h"
14 -#include "object-store.h"
14 +#include "odb.h"
15 #include "server-info.h"
16 #include "strbuf.h"
17 #include "tempfile.h"
shallow.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "repository.h"
6 #include "tempfile.h"
7 #include "lockfile.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "commit.h"
10 #include "tag.h"
11 #include "pkt-line.h"
streaming.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "streaming.h"
11 #include "repository.h"
12 #include "object-file.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14 #include "replace-object.h"
15 #include "packfile.h"
16
submodule-config.c
+1 -1
@@ -13,7 +13,7 @@
13 #include "submodule.h"
14 #include "strbuf.h"
15 #include "object-name.h"
16 -#include "object-store.h"
16 +#include "odb.h"
17 #include "parse-options.h"
18 #include "thread-utils.h"
19 #include "tree-walk.h"
submodule.c
+1 -1
@@ -27,7 +27,7 @@
27 #include "parse-options.h"
28 #include "object-file.h"
29 #include "object-name.h"
30 -#include "object-store.h"
30 +#include "odb.h"
31 #include "commit-reach.h"
32 #include "read-cache-ll.h"
33 #include "setup.h"
t/helper/test-find-pack.c
+1 -1
@@ -2,7 +2,7 @@
2
3 #include "test-tool.h"
4 #include "object-name.h"
5 -#include "object-store.h"
5 +#include "odb.h"
6 #include "packfile.h"
7 #include "parse-options.h"
8 #include "setup.h"
t/helper/test-pack-mtimes.c
+1 -1
@@ -3,7 +3,7 @@
3 #include "test-tool.h"
4 #include "hex.h"
5 #include "strbuf.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "packfile.h"
8 #include "pack-mtimes.h"
9 #include "setup.h"
t/helper/test-partial-clone.c
+1 -1
@@ -1,7 +1,7 @@
1 #include "test-tool.h"
2 #include "hex.h"
3 #include "repository.h"
4 -#include "object-store.h"
4 +#include "odb.h"
5 #include "setup.h"
6
7 /*
t/helper/test-read-graph.c
+1 -1
@@ -3,7 +3,7 @@
3 #include "test-tool.h"
4 #include "commit-graph.h"
5 #include "repository.h"
6 -#include "object-store.h"
6 +#include "odb.h"
7 #include "bloom.h"
8 #include "setup.h"
9
t/helper/test-read-midx.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "hex.h"
5 #include "midx.h"
6 #include "repository.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8 #include "pack-bitmap.h"
9 #include "packfile.h"
10 #include "setup.h"
t/helper/test-ref-store.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "refs.h"
6 #include "setup.h"
7 #include "worktree.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "path.h"
10 #include "repository.h"
11 #include "strbuf.h"
tag.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "environment.h"
6 #include "tag.h"
7 #include "object-name.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "commit.h"
10 #include "tree.h"
11 #include "blob.h"
tmp-objdir.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "strbuf.h"
11 #include "strvec.h"
12 #include "quote.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14 #include "repository.h"
15
16 struct tmp_objdir {
tree-walk.c
+1 -1
@@ -6,7 +6,7 @@
6 #include "gettext.h"
7 #include "hex.h"
8 #include "object-file.h"
9 -#include "object-store.h"
9 +#include "odb.h"
10 #include "trace2.h"
11 #include "tree.h"
12 #include "pathspec.h"
tree.c
+1 -1
@@ -4,7 +4,7 @@
4 #include "hex.h"
5 #include "tree.h"
6 #include "object-name.h"
7 -#include "object-store.h"
7 +#include "odb.h"
8 #include "commit.h"
9 #include "alloc.h"
10 #include "tree-walk.h"
unpack-trees.c
+1 -1
@@ -26,7 +26,7 @@
26 #include "symlinks.h"
27 #include "trace2.h"
28 #include "fsmonitor.h"
29 -#include "object-store.h"
29 +#include "odb.h"
30 #include "promisor-remote.h"
31 #include "entry.h"
32 #include "parallel-checkout.h"
upload-pack.c
+1 -1
@@ -10,7 +10,7 @@
10 #include "pkt-line.h"
11 #include "sideband.h"
12 #include "repository.h"
13 -#include "object-store.h"
13 +#include "odb.h"
14 #include "oid-array.h"
15 #include "object.h"
16 #include "commit.h"
walker.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "hex.h"
6 #include "walker.h"
7 #include "repository.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "commit.h"
10 #include "strbuf.h"
11 #include "tree.h"
xdiff-interface.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "gettext.h"
6 #include "config.h"
7 #include "hex.h"
8 -#include "object-store.h"
8 +#include "odb.h"
9 #include "strbuf.h"
10 #include "xdiff-interface.h"
11 #include "xdiff/xtypes.h"