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>

diff --git a/Makefile b/Makefile
index 70d1543b6b8688bf348f03f5e9cc1690fe547249..4b1bf8977913f44185ac35c2f8c0982c42b4b70c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1085,8 +1085,8 @@ LIB_OBJS += notes.o
 LIB_OBJS += object-file-convert.o
 LIB_OBJS += object-file.o
 LIB_OBJS += object-name.o
-LIB_OBJS += object-store.o
 LIB_OBJS += object.o
+LIB_OBJS += odb.o
 LIB_OBJS += oid-array.o
 LIB_OBJS += oidmap.o
 LIB_OBJS += oidset.o

diff --git a/apply.c b/apply.c
index 8bbe6ed224032e5f5e0cfacef8c5d0626fd77459..e778b4e911de98298804d7c076887a06ec015f79 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -14,7 +14,7 @@
 #include "abspath.h"
 #include "base85.h"
 #include "config.h"
-#include "object-store.h"
+#include "odb.h"
 #include "delta.h"
 #include "diff.h"
 #include "dir.h"

diff --git a/archive-tar.c b/archive-tar.c
index 282b48196f98105bc362e7619a8116964d681d0c..249164ea77dc04ad6a15a3b7ad3798a6f89879bc 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -11,7 +11,7 @@
 #include "hex.h"
 #include "tar.h"
 #include "archive.h"
-#include "object-store.h"
+#include "odb.h"
 #include "strbuf.h"
 #include "streaming.h"
 #include "run-command.h"

diff --git a/archive-zip.c b/archive-zip.c
index 405da6f3d830048326beac71db1572c8de6736d0..df8866d5bae28a1e555c8b0d95609bb92abc7a2c 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -12,7 +12,7 @@
 #include "hex.h"
 #include "streaming.h"
 #include "utf8.h"
-#include "object-store.h"
+#include "odb.h"
 #include "strbuf.h"
 #include "userdiff.h"
 #include "write-or-die.h"

diff --git a/archive.c b/archive.c
index 8309ea213e6ea08b8b5c152e8bc13302b3ecafc7..7fa2cc2596a50e1e15e9deaa3c369ab8909d1cfb 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -14,7 +14,7 @@
 #include "pretty.h"
 #include "setup.h"
 #include "refs.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "tree.h"
 #include "tree-walk.h"

diff --git a/attr.c b/attr.c
index 86b6109fc4e328f28fc8d4acc24776881b5dedbb..e5680db7f650808cf0b8ee0c4f8ddecb6e2b5200 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -22,7 +22,7 @@
 #include "read-cache-ll.h"
 #include "refs.h"
 #include "revision.h"
-#include "object-store.h"
+#include "odb.h"
 #include "setup.h"
 #include "thread-utils.h"
 #include "tree-walk.h"

diff --git a/bisect.c b/bisect.c
index a327468c75bbcd8a96840c2dc45687c2b802566b..a7939216d00eaf9853715aff07740a1108bb0c3b 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -20,7 +20,7 @@
 #include "commit-slab.h"
 #include "commit-reach.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "dir.h"
 

diff --git a/blame.c b/blame.c
index 57daa45e8996e8c2b436d9a50daa99a2e4df48ae..0ceea080a80cb22be44cf653aa6c150377eb87f5 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -3,7 +3,7 @@
 
 #include "git-compat-util.h"
 #include "refs.h"
-#include "object-store.h"
+#include "odb.h"
 #include "cache-tree.h"
 #include "mergesort.h"
 #include "commit.h"

diff --git a/builtin/backfill.c b/builtin/backfill.c
index fa82ad2f6ff0b176474866cf2fcf787aa1df3e4a..0b49baa39fa5c88b57813e5c409fe1f9f7a723bb 100644 (file)
--- a/builtin/backfill.c
+++ b/builtin/backfill.c
@@ -13,7 +13,7 @@
 #include "tree.h"
 #include "tree-walk.h"
 #include "object.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "oidset.h"
 #include "promisor-remote.h"

diff --git a/builtin/blame.c b/builtin/blame.c
index 944952e30ebaac9066eedb91032ffbf1b302c434..15eda60af904e0887a8aa3c6d173b9d63aa1fb1e 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -28,7 +28,7 @@
 #include "line-log.h"
 #include "progress.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pager.h"
 #include "blame.h"
 #include "refs.h"

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 67a5ff2b9ebd29d7d2bad988c44abc885dd9f44c..f3a925a8183c2801311953abe61c89c262d62125 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -24,7 +24,7 @@
 #include "pack-bitmap.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "replace-object.h"
 #include "promisor-remote.h"
 #include "mailmap.h"

diff --git a/builtin/checkout.c b/builtin/checkout.c
index d185982f3a6372ff8939b95c032b554f4d7f67b1..e7dd66173dd0bb5734c4c9160ccce9db70267216 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -20,7 +20,7 @@
 #include "merge-ort-wrappers.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "parse-options.h"
 #include "path.h"
 #include "preload-index.h"

diff --git a/builtin/clone.c b/builtin/clone.c
index 91b9cd0d16419852bfe3e10dd99d68b92a2a37ec..1eafeefb48d1fc95b6d91ff7297a0aa02474cb62 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -25,7 +25,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "tree.h"
 #include "tree-walk.h"
 #include "unpack-trees.h"

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 98a843153429948cc5002dc3e32b14f8bde382a5..f04eaba525934332164d34a04392600bb756be89 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -6,7 +6,7 @@
 #include "hex.h"
 #include "parse-options.h"
 #include "commit-graph.h"
-#include "object-store.h"
+#include "odb.h"
 #include "progress.h"
 #include "replace-object.h"
 #include "strbuf.h"

diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index ad6b2c9320931dff5c668f00a9fbbacd758acda7..546069f868202797002c083e28d4b80896230cbd 100644 (file)
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -9,7 +9,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 
 #include "commit.h"
 #include "parse-options.h"

diff --git a/builtin/describe.c b/builtin/describe.c
index 2d50883b729671b9d7335e7aedf9f7d74c7c23ef..96cb68e5e5d0e7cb9e2662e04885d253d28655ec 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -19,7 +19,7 @@
 #include "setup.h"
 #include "strvec.h"
 #include "run-command.h"
-#include "object-store.h"
+#include "odb.h"
 #include "list-objects.h"
 #include "commit-slab.h"
 #include "wildmatch.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index a3b64ce69426bfb2a6436eab9c34dc906e1ca9b4..fac613e3bc385ac0d51fa85f819dc190343c4013 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -30,7 +30,7 @@
 #include "strbuf.h"
 #include "lockfile.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "dir.h"
 #include "entry.h"
 #include "setup.h"

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 37c01d6c6fe6cb2d32555cdc343ab9bd261b028d..0505f289a94e167e2fbdcaeb5960733a69a84e72 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -14,7 +14,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "object.h"
 #include "tag.h"

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index b2839c5f439b7bf5bbee70eb6ff652b1bca89ac6..52c792488e1379f988f3964dd7e5fd2678b6bcd4 100644 (file)
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -24,7 +24,7 @@
 #include "packfile.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "mem-pool.h"
 #include "commit-reach.h"
 #include "khash.h"

diff --git a/builtin/fetch.c b/builtin/fetch.c
index a890e2864d13d9ce7881f9e7deca2c5e49bd27f2..b842bc9c51bb1cc7cee0bc9ad9211d4ecf0c9d3a 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -14,7 +14,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oidset.h"
 #include "oid-array.h"
 #include "commit.h"

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 6e1474f63d59fd7bcfe7486e0b399dc81f0ed821..9abd7b255808a08942e0a0d378bfb3c526c3aa88 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -17,7 +17,7 @@
 #include "packfile.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "read-cache-ll.h"
 #include "replace-object.h"

diff --git a/builtin/grep.c b/builtin/grep.c
index 76b1938bba515269d7f82753cc177e24dc700976..a1d7ee7af39687e0aa486e7f6ee0840a148fdee4 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -26,7 +26,7 @@
 #include "submodule-config.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "pager.h"
 #include "path.h"

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 6a99ec250d028fd39dcba912993722a8b686126f..e28f000221f618c1dab99f80a34b4c06726953d2 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -11,7 +11,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "blob.h"
 #include "quote.h"
 #include "parse-options.h"

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index bb7925bd29f0aa407c8073718ca871d97d138040..1aabe6b8ee213f1745227bd9d19b43c1bc568279 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -21,7 +21,7 @@
 #include "packfile.h"
 #include "pack-revindex.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "oidset.h"
 #include "path.h"

diff --git a/builtin/log.c b/builtin/log.c
index b450cd3bde821bc751edad5407b95547c2482b47..fe9cc5ebecb231e24e9068c1795647f85e775993 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -15,7 +15,7 @@
 #include "hex.h"
 #include "refs.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pager.h"
 #include "color.h"
 #include "commit.h"

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index be74f0a03b20f323b6e536454509d0d22f2d6386..821339b07d4f3dbbc75ce293f3e4b076502230ba 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -25,7 +25,7 @@
 #include "setup.h"
 #include "sparse-index.h"
 #include "submodule.h"
-#include "object-store.h"
+#include "odb.h"
 #include "hex.h"
 
 

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 8aafc30ca48f7a281fe41e14d165389e18831c86..62b6fd58c1655d9e307446b5390a2e3399a90678 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -10,7 +10,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "tree.h"
 #include "path.h"
 #include "quote.h"

diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 2b16b10d2cad1f1c2746f290fd43c99b67a19ca4..9464f2756299ec253673980c766e01783d5edd89 100644 (file)
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -7,7 +7,7 @@
 #include "hex.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "config.h"
 #include "gettext.h"
 #include "setup.h"

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 7f41665dfd7e67b13040380438560ba3ae896dff..b1a17787bcf913c32b138212c9efcd364da819c9 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -10,7 +10,7 @@
 #include "commit-reach.h"
 #include "merge-ort.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "parse-options.h"
 #include "blob.h"
 #include "merge-blobs.h"

diff --git a/builtin/mktag.c b/builtin/mktag.c
index 7ac11c46d53f037fc3e8192e4f7c1d81836ef8db..1809b38f937f3b6d36d3b774a157a546df8901ea 100644 (file)
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -6,7 +6,7 @@
 #include "strbuf.h"
 #include "replace-object.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "fsck.h"
 #include "config.h"
 

diff --git a/builtin/mktree.c b/builtin/mktree.c
index 4b4780346751cb0e3ab0376833b56dc11bcfdc66..016b0e5b2247927e48f853770eb8eb94ff8d16b3 100644 (file)
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -12,7 +12,7 @@
 #include "tree.h"
 #include "parse-options.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 
 static struct treeent {
        unsigned mode;

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index f55bf53da838a5a52630fe4b9d1332886cc4d242..aa25b06f9d0f89b652aff548f05ea6505970cc4c 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -7,7 +7,7 @@
 #include "midx.h"
 #include "strbuf.h"
 #include "trace2.h"
-#include "object-store.h"
+#include "odb.h"
 #include "replace-object.h"
 #include "repository.h"
 

diff --git a/builtin/notes.c b/builtin/notes.c
index a3f433ca4c06facbde4243d4db062ce43c6f2929..783d4932ca6efe8172c701e390598e85fcc291cd 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -16,7 +16,7 @@
 #include "notes.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 
 #include "pretty.h"

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 8b33edc2ff525a4f28ddb6ff8f421ffab42416f7..99b63cb0980218bb209d9b4246473fd2d286ef21 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -32,7 +32,7 @@
 #include "list.h"
 #include "packfile.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "replace-object.h"
 #include "dir.h"
 #include "midx.h"

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 5d1fc781761c79b14f54366cc31185b5a0917a40..3134cb8c689d0149fd7631bb6358dba40ded70c9 100644 (file)
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -13,7 +13,7 @@
 #include "hex.h"
 
 #include "packfile.h"
-#include "object-store.h"
+#include "odb.h"
 #include "strbuf.h"
 
 #define BLKSIZE 512

diff --git a/builtin/prune.c b/builtin/prune.c
index e930caa0c0af0e1ba2be153497da4e3e1c29e01d..7bbfb14c2bedf44e51596b5672c19b5d306ac4a1 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -17,7 +17,7 @@
 #include "replace-object.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "shallow.h"
 
 static const char * const prune_usage[] = {

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index a317d6c278de2174db2ee7d5d782ede4f7331944..0f5958c4a6601e0eca5f397906b5a096ad524979 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -33,7 +33,7 @@
 #include "packfile.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "protocol.h"
 #include "commit-reach.h"

diff --git a/builtin/remote.c b/builtin/remote.c
index 0d6755bcb71e3db51b2a2b0f7150b66d40000b6e..ac5b8d2a1a6506cae98d4f5239b51c2e21075479 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -14,7 +14,7 @@
 #include "rebase.h"
 #include "refs.h"
 #include "refspec.h"
-#include "object-store.h"
+#include "odb.h"
 #include "strvec.h"
 #include "commit-reach.h"
 #include "progress.h"

diff --git a/builtin/repack.c b/builtin/repack.c
index 59214dbdfdfcd537f017e130f5ec38211797e7e6..167823200586fba3b877529efaa024a4498e7052 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -17,7 +17,7 @@
 #include "midx.h"
 #include "packfile.h"
 #include "prune-packed.h"
-#include "object-store.h"
+#include "odb.h"
 #include "promisor-remote.h"
 #include "shallow.h"
 #include "pack.h"

diff --git a/builtin/replace.c b/builtin/replace.c
index 48c7c6a2d56d92b0e09d2a34f32ee327a2a7639f..11c7e2d4c0cbcccefb6333168ba51c7cb6da8846 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -19,7 +19,7 @@
 #include "run-command.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "replace-object.h"
 #include "tag.h"
 #include "wildmatch.h"

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 0984b607bf052d7d248083f358f2c56f53c16c55..0ee37a32cb211c54a13ef56da16d9c451f8f0a59 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -14,7 +14,7 @@
 #include "object.h"
 #include "object-name.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pack-bitmap.h"
 #include "parse-options.h"
 #include "log-tree.h"

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 623a52a45f85cf634f0f9a6ce9b017dbe752d59e..90ec1de78f90024e155edcf4d457d090faffdbe2 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -5,7 +5,7 @@
 #include "hex.h"
 #include "refs/refs-internal.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "object.h"
 #include "string-list.h"
 #include "parse-options.h"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 758bc6d0f240893d9e242f87bf43d90870ea523e..84f7fa53424ceb17f4623cf689504ad33e145119 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -28,7 +28,7 @@
 #include "diff.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "advice.h"
 #include "branch.h"
 #include "list-objects-filter-options.h"

diff --git a/builtin/tag.c b/builtin/tag.c
index 4742b27d16e5cfa9bd61c73d5afaa76812f32532..cf2ea4b4993daf1b03c1d0931afb79de8f78943f 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -19,7 +19,7 @@
 #include "refs.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "tag.h"
 #include "parse-options.h"

diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index e33acfc4ee47647733ecefd1888d809426f2defb..b92fd4710a99db3b077ef9ed88e1e8814ca73191 100644 (file)
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -4,7 +4,7 @@
 #include "hex.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 
 static char *create_temp_file(struct object_id *oid)
 {

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index e905d5f4e1964b43e2262500053f3e53753eaeab..7bf395eec8461d265b0b631433604addcb4ac92f 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -9,7 +9,7 @@
 #include "git-zlib.h"
 #include "hex.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "object.h"
 #include "delta.h"
 #include "pack.h"

diff --git a/bulk-checkin.c b/bulk-checkin.c
index 678e2ecc2c29da93d918dabaee4088e4ca28ceb8..55406a539e7d4a23ea40d76ef7620f2b19cada7c 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -17,7 +17,7 @@
 #include "tmp-objdir.h"
 #include "packfile.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 
 static int odb_transaction_nesting;
 

diff --git a/bundle-uri.c b/bundle-uri.c
index 9accf157b44a7a56b382071dc12515a3ac0b087c..2e623f8627abea6808364f4dafb11ce66d18824f 100644 (file)
--- a/bundle-uri.c
+++ b/bundle-uri.c
@@ -14,7 +14,7 @@
 #include "fetch-pack.h"
 #include "remote.h"
 #include "trace2.h"
-#include "object-store.h"
+#include "odb.h"
 
 static struct {
        enum bundle_list_heuristic heuristic;

diff --git a/bundle.c b/bundle.c
index 2ce7525f90d564ba96a9e83df2ad68a55644f232..e09e3c2f58c3e969a34572662777311eaac2c5fb 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -7,7 +7,7 @@
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "repository.h"
 #include "object.h"
 #include "commit.h"

diff --git a/cache-tree.c b/cache-tree.c
index fa3858e2829aa89eb8246d6519991d8925b04402..9786b32b3a1caab41190588ff2028c30e374d645 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -10,7 +10,7 @@
 #include "cache-tree.h"
 #include "bulk-checkin.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "read-cache-ll.h"
 #include "replace-object.h"
 #include "repository.h"

diff --git a/combine-diff.c b/combine-diff.c
index dfae9f7995da511085ccbb6cf0f5cbae8357f843..cf23a753407561e9100cda7c3fead822b39214de 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -2,7 +2,7 @@
 #define DISABLE_SIGN_COMPARE_WARNINGS
 
 #include "git-compat-util.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "convert.h"
 #include "diff.h"

diff --git a/commit-graph.c b/commit-graph.c
index 12d32cdad1dc87f64b185d995ae95f8ba6981242..6ced5b366e71014b4027e2564ecf2715de36b045 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -13,7 +13,7 @@
 #include "refs.h"
 #include "hash-lookup.h"
 #include "commit-graph.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "path.h"
 #include "alloc.h"

diff --git a/commit-graph.h b/commit-graph.h
index 0e661db1b54dd97738d521790800092f5b4bdcb9..78ab7b875b2751c4e6c4ba496f346f1960787ad1 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -1,7 +1,7 @@
 #ifndef COMMIT_GRAPH_H
 #define COMMIT_GRAPH_H
 
-#include "object-store.h"
+#include "odb.h"
 #include "oidset.h"
 
 #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"

diff --git a/commit.c b/commit.c
index e915b2b9a1295c88e64d903e9352c3e85ff3c6d3..1d30f8ce15ad8c3094cf349bf23a514dc5224286 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -9,7 +9,7 @@
 #include "hex.h"
 #include "repository.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "utf8.h"
 #include "diff.h"
 #include "revision.h"

diff --git a/config.c b/config.c
index b18b5617fcd05d146aec7b44edd50ff53523be39..883dd0668271c698a2c90e002d8662eb16273a9d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -31,7 +31,7 @@
 #include "hashmap.h"
 #include "string-list.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pager.h"
 #include "path.h"
 #include "utf8.h"

diff --git a/connected.c b/connected.c
index 4415388bebacdf58b2807f0b99943b549b36689f..18c13245d8e40c66a22fa5d7c2d139b85e5113c2 100644 (file)
--- a/connected.c
+++ b/connected.c
@@ -3,7 +3,7 @@
 #include "git-compat-util.h"
 #include "gettext.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "run-command.h"
 #include "sigchain.h"
 #include "connected.h"

diff --git a/contrib/coccinelle/the_repository.cocci b/contrib/coccinelle/the_repository.cocci
index 765ad689678f22e070d1ed00e57cc54a390b1f9b..ea7fe1c8db78f39a72f17a90fef439447adb794e 100644 (file)
--- a/contrib/coccinelle/the_repository.cocci
+++ b/contrib/coccinelle/the_repository.cocci
@@ -77,7 +77,7 @@
 |
 - diff_setup
 + repo_diff_setup
-// object-store.h
+// odb.h
 |
 - read_object_file
 + repo_read_object_file

diff --git a/diagnose.c b/diagnose.c
index d08d5643aac4f8235959a607bcfffbdb7c68885a..ad0d5c1246558d70b4237a3ae175691a807ad394 100644 (file)
--- a/diagnose.c
+++ b/diagnose.c
@@ -7,7 +7,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "strvec.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "parse-options.h"
 #include "repository.h"

diff --git a/diff.c b/diff.c
index 90e8003dd11e4df314ac8cff73a842164d663c42..3af108115b351bbb2629abfef2fb5c541006170a 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -23,7 +23,7 @@
 #include "color.h"
 #include "run-command.h"
 #include "utf8.h"
-#include "object-store.h"
+#include "odb.h"
 #include "userdiff.h"
 #include "submodule.h"
 #include "hashmap.h"

diff --git a/entry.c b/entry.c
index f36ec5ad24205af4b70da676e00413ccbb79ff94..75d55038d7ceb8e35fed443f2809943ce06faa99 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -1,7 +1,7 @@
 #define USE_THE_REPOSITORY_VARIABLE
 
 #include "git-compat-util.h"
-#include "object-store.h"
+#include "odb.h"
 #include "dir.h"
 #include "environment.h"
 #include "gettext.h"

diff --git a/fetch-pack.c b/fetch-pack.c
index fa4231fee74c9f4efbeb61480859c20219718d29..cf157f5d7e583eb18a2d44102655f9ec44c1888a 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -24,7 +24,7 @@
 #include "oid-array.h"
 #include "oidset.h"
 #include "packfile.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "connected.h"
 #include "fetch-negotiator.h"

diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 501b5acdd44c22c822597e6928a9db1f87d2d727..1a8c972adf3ad7698bb921a379fa050c527f0182 100644 (file)
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -6,7 +6,7 @@
 #include "environment.h"
 #include "refs.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "diff.h"
 #include "diff-merges.h"
 #include "hex.h"

diff --git a/fsck.c b/fsck.c
index 8dc8472ceb3781a9368ff8635d83b71dded70f75..e69baab3af7ede71237d4e768dfeb85c9c773137 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -4,7 +4,7 @@
 #include "date.h"
 #include "dir.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "repository.h"
 #include "object.h"

diff --git a/grep.c b/grep.c
index f8d535182c36d35ae7701a73611e9b69635d45d4..dc77e6c46319156815e198ee060e8c8f0b515c60 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -5,7 +5,7 @@
 #include "gettext.h"
 #include "grep.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pretty.h"
 #include "userdiff.h"
 #include "xdiff-interface.h"

diff --git a/http-backend.c b/http-backend.c
index 0c575aa88aaf32700921e80095ca2433522fc617..ad8c4037493057e96952a3e593d6fb20b29e6903 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -18,7 +18,7 @@
 #include "url.h"
 #include "strvec.h"
 #include "packfile.h"
-#include "object-store.h"
+#include "odb.h"
 #include "protocol.h"
 #include "date.h"
 #include "write-or-die.h"

diff --git a/http-push.c b/http-push.c
index f9e67cabd4bee8ac4ac223e990623988314683c3..d1b1bb237116534b62309bd48f76a7dc731df68f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -20,7 +20,7 @@
 #include "url.h"
 #include "packfile.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit-reach.h"
 
 #ifdef EXPAT_NEEDS_XMLPARSE_H

diff --git a/http-walker.c b/http-walker.c
index c374e6b2056a01ccb40d1645943218bb3da517ce..05fb9ce714a4c94972aa3ad7c60a23851faace15 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -10,7 +10,7 @@
 #include "transport.h"
 #include "packfile.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 
 struct alt_base {
        char *base;

diff --git a/http.c b/http.c
index 5e15bbab3f1dd57975f562d92323cfdbe0a843de..8f4f701a818ac253b48bb08a9a04b85db44efe42 100644 (file)
--- a/http.c
+++ b/http.c
@@ -19,7 +19,7 @@
 #include "packfile.h"
 #include "string-list.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "tempfile.h"
 
 static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);

diff --git a/list-objects-filter.c b/list-objects-filter.c
index 78b397bc194849b4c32ec48bc7af1aadb0a5cfb5..80fe48a52c8a7c4c4035490d84774e357161ee0c 100644 (file)
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -12,7 +12,7 @@
 #include "oidmap.h"
 #include "oidset.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 
 /* Remember to update object flag allocation in object.h */
 /*

diff --git a/list-objects.c b/list-objects.c
index 597114281f6596e6fe50171a0764ce71fc442657..c50b9578584d20c561c65dbc83ee0e05abc3e298 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -14,7 +14,7 @@
 #include "list-objects-filter.h"
 #include "list-objects-filter-options.h"
 #include "packfile.h"
-#include "object-store.h"
+#include "odb.h"
 #include "trace.h"
 #include "environment.h"
 

diff --git a/loose.c b/loose.c
index fe65d5b9b0f5c70d7e5e904b5f8a04bc41bd1b97..fab4041c03d50bc49fa81c149c0157bc9c024dfe 100644 (file)
--- a/loose.c
+++ b/loose.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include "hash.h"
 #include "path.h"
-#include "object-store.h"
+#include "odb.h"
 #include "hex.h"
 #include "repository.h"
 #include "wrapper.h"

diff --git a/mailmap.c b/mailmap.c
index 9e2642a043b1fb2308949181f161722ecbb5e942..b18e74c2110e7818c481dabfc6351ddf1eca8eb9 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -6,7 +6,7 @@
 #include "string-list.h"
 #include "mailmap.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "setup.h"
 
 char *git_mailmap_file;

diff --git a/match-trees.c b/match-trees.c
index 72922d5d64e777e54c80538b119fa3105f8984aa..4704f95c3402e67dc8a641d4b094988bf2d488e4 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -7,7 +7,7 @@
 #include "tree.h"
 #include "tree-walk.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "repository.h"
 
 static int score_missing(unsigned mode)

diff --git a/merge-blobs.c b/merge-blobs.c
index 53f36dbc1750e71185591a610c5b68b46857241e..ba8a3fdfd82b74bd9d4b5753e97ae7d129f3ef40 100644 (file)
--- a/merge-blobs.c
+++ b/merge-blobs.c
@@ -4,7 +4,7 @@
 #include "merge-ll.h"
 #include "blob.h"
 #include "merge-blobs.h"
-#include "object-store.h"
+#include "odb.h"
 
 static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
 {

diff --git a/merge-ort.c b/merge-ort.c
index 47b3d1730ece367020eb6c9736c6419f6cd9372f..9f693ab1d36c9abdc89bfbce9f4d14ddf2f04154 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -39,7 +39,7 @@
 #include "mem-pool.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "path.h"
 #include "promisor-remote.h"

diff --git a/meson.build b/meson.build
index 596f5ac7110ebf608ced79dc335226d10a09b4a8..3fad0e39987d7dda4bfa69f14fbfc6d21826589c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -396,8 +396,8 @@ libgit_sources = [
   'object-file-convert.c',
   'object-file.c',
   'object-name.c',
-  'object-store.c',
   'object.c',
+  'odb.c',
   'oid-array.c',
   'oidmap.c',
   'oidset.c',

diff --git a/notes-cache.c b/notes-cache.c
index 150241b15e09055c95644519a6d5e87eae0e7516..344f67762b8c183feee795dac2626aa9e4a83349 100644 (file)
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -3,7 +3,7 @@
 #include "git-compat-util.h"
 #include "notes-cache.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pretty.h"
 #include "repository.h"
 #include "commit.h"

diff --git a/notes-merge.c b/notes-merge.c
index dae8e6a281aab06005faff76bdda3b0adf7552f7..de6a52e2e7ff3fe064e1fcbb2392a83c1a2b8956 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -8,7 +8,7 @@
 #include "refs.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "repository.h"
 #include "diff.h"

diff --git a/notes.c b/notes.c
index 0a128f1de980506466ac0b66568ef15219ec4dff..fc000e501d2a63e371d0af2ca7c258bf6a1a94a5 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -8,7 +8,7 @@
 #include "notes.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "utf8.h"
 #include "strbuf.h"
 #include "tree-walk.h"

diff --git a/object-file.c b/object-file.c
index 6bad1d3dd1cf132d037147ae27a3662645e7aba2..2d3af8a77c0f5ba2e4319a725dc3610881cb3fc1 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -21,7 +21,7 @@
 #include "loose.h"
 #include "object-file-convert.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oidtree.h"
 #include "pack.h"
 #include "packfile.h"

diff --git a/object-file.h b/object-file.h
index 9a18859b2e0c9dcfc9242939beb94e9bb22d70f9..5066638f8eccd0aa0f443ee587d11c6bd1a36473 100644 (file)
--- a/object-file.h
+++ b/object-file.h
@@ -3,7 +3,7 @@
 
 #include "git-zlib.h"
 #include "object.h"
-#include "object-store.h"
+#include "odb.h"
 
 struct index_state;
 

diff --git a/object-store.c b/odb.c
similarity index 99%
rename from object-store.c
rename to odb.c
index 5c04a1018f7c7aec12028110be45a12ee8862857..d1025ac182d15110b8a7fd1fe2700d0451211b2b 100644 (file)
--- a/object-store.c
+++ b/odb.c
@@ -13,7 +13,7 @@
 #include "loose.h"
 #include "object-file-convert.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "path.h"
 #include "promisor-remote.h"

diff --git a/object-store.h b/odb.h
similarity index 99%
rename from object-store.h
rename to odb.h
index d199d757d7620c19fd4d4f1ce13193533a297816..6f56b168e4665ea19009462f2e8ffa17047a3957 100644 (file)
--- a/object-store.h
+++ b/odb.h
@@ -1,5 +1,5 @@
-#ifndef OBJECT_STORE_H
-#define OBJECT_STORE_H
+#ifndef ODB_H
+#define ODB_H
 
 #include "hashmap.h"
 #include "object.h"
@@ -352,4 +352,4 @@ void *read_object_with_reference(struct repository *r,
                                 unsigned long *size,
                                 struct object_id *oid_ret);
 
-#endif /* OBJECT_STORE_H */
+#endif /* ODB_H */

diff --git a/oss-fuzz/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c
index 609a343ee3ea41e6c4f18f0d07a104922dc952f2..d2a92f34d98ae99b7f526ba456ccd32e3840c7b6 100644 (file)
--- a/oss-fuzz/fuzz-pack-idx.c
+++ b/oss-fuzz/fuzz-pack-idx.c
@@ -1,5 +1,5 @@
 #include "git-compat-util.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 7f400ee01213da1489257560cd39a70a06bb4116..37648b57125567ac9a794e653506be705d143c7a 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -4,7 +4,7 @@
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "diff.h"
 #include "revision.h"

diff --git a/pack-bitmap.c b/pack-bitmap.c
index ac6d62b980c5a8d086bb1b71f46df721d11b3ad4..a695a794e9b7039ec1e907cc51834984fb18d0f5 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -17,7 +17,7 @@
 #include "packfile.h"
 #include "repository.h"
 #include "trace2.h"
-#include "object-store.h"
+#include "odb.h"
 #include "list-objects-filter-options.h"
 #include "midx.h"
 #include "config.h"

diff --git a/pack-check.c b/pack-check.c
index 874897d6cbab12f74f0655460c0fc56796a9fc4f..67cb2cf72f2b93c9e652fbc72cf456628f29bc62 100644 (file)
--- a/pack-check.c
+++ b/pack-check.c
@@ -8,7 +8,7 @@
 #include "progress.h"
 #include "packfile.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 
 struct idx_entry {
        off_t                offset;

diff --git a/pack-mtimes.c b/pack-mtimes.c
index 20900ca88d377af3b11f636614a5a5fd54973731..8e1f2dec0ef62f002555c3c6db1c5ea8ab57dbe5 100644 (file)
--- a/pack-mtimes.c
+++ b/pack-mtimes.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include "gettext.h"
 #include "pack-mtimes.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "strbuf.h"
 

diff --git a/pack-objects.h b/pack-objects.h
index 475a2d67ce30ebf01acd4ebc640f3f2788c6d088..1ac8644201b58d6088e57a3fcdccb95f1c3b2ebb 100644 (file)
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -1,7 +1,7 @@
 #ifndef PACK_OBJECTS_H
 #define PACK_OBJECTS_H
 
-#include "object-store.h"
+#include "odb.h"
 #include "thread-utils.h"
 #include "pack.h"
 #include "packfile.h"

diff --git a/pack-revindex.c b/pack-revindex.c
index ffcde48870d8f7a5ec902fa1307f38922d9fabad..0cc422a1e67bc84477daf3526edebcce3a05eb39 100644 (file)
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include "gettext.h"
 #include "pack-revindex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "strbuf.h"
 #include "trace2.h"

diff --git a/packfile.c b/packfile.c
index 60661ad00951f476c6fbf15d64b57faf9568b6ac..346c2f9ce9057492c1a151f5c15fa01c994ccd6d 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -19,7 +19,7 @@
 #include "tree-walk.h"
 #include "tree.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "midx.h"
 #include "commit-graph.h"
 #include "pack-revindex.h"

diff --git a/packfile.h b/packfile.h
index 826eb7f475fc319a7e82e430f44f29350a10ab83..53c3b7d3b43cba18663ef74c70f15aba79b7f805 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -3,10 +3,10 @@
 
 #include "list.h"
 #include "object.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oidset.h"
 
-/* in object-store.h */
+/* in odb.h */
 struct object_info;
 
 struct packed_git {

diff --git a/path.c b/path.c
index c347829aa667cc0267b2443f22926b6b2f92f3d7..7f56eaf9930374274042b5af8cfb7219659d1272 100644 (file)
--- a/path.c
+++ b/path.c
@@ -15,7 +15,7 @@
 #include "submodule-config.h"
 #include "path.h"
 #include "packfile.h"
-#include "object-store.h"
+#include "odb.h"
 #include "lockfile.h"
 #include "exec-cmd.h"
 

diff --git a/promisor-remote.c b/promisor-remote.c
index 9d058586dfa8a4833de506925f8c9b2346c4a7a0..2baa286bfd04bace2fff8f12bf27b180f38a493f 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -3,7 +3,7 @@
 #include "git-compat-util.h"
 #include "gettext.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "promisor-remote.h"
 #include "config.h"
 #include "trace2.h"

diff --git a/protocol-caps.c b/protocol-caps.c
index 9b8db37a2105fc1db8e1e08676c56154fda8ee62..3022f69a1bd55ff461b36f0d18d72e0a9644a013 100644 (file)
--- a/protocol-caps.c
+++ b/protocol-caps.c
@@ -6,7 +6,7 @@
 #include "hash.h"
 #include "hex.h"
 #include "object.h"
-#include "object-store.h"
+#include "odb.h"
 #include "repository.h"
 #include "string-list.h"
 #include "strbuf.h"

diff --git a/read-cache.c b/read-cache.c
index c0bb760ad473efdf91641e4d28954b3e17d4e9df..c3fa9686766375a5428d560cfddb13a68bed830d 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -20,7 +20,7 @@
 #include "refs.h"
 #include "dir.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "tree.h"
 #include "commit.h"

diff --git a/ref-filter.c b/ref-filter.c
index 7a274633cfc7e7cb25d041aab8bbf02f1887b451..4ce45440ad12cb62e39c7771942d1f4eb0174101 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -12,7 +12,7 @@
 #include "refs.h"
 #include "wildmatch.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "repo-settings.h"
 #include "repository.h"

diff --git a/reflog.c b/reflog.c
index 15d81ebea978d347670b6486dc54dc084355d23c..4f8a3b717cdb7404b7f128445e40db95bf396651 100644 (file)
--- a/reflog.c
+++ b/reflog.c
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "gettext.h"
 #include "parse-options.h"
-#include "object-store.h"
+#include "odb.h"
 #include "reflog.h"
 #include "refs.h"
 #include "revision.h"

diff --git a/refs.c b/refs.c
index 5f6a386cc93bf9995b107a7f4e4487bed91cea0b..0ff0e582a6b0190d99436be9dae36365ee27589c 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -19,7 +19,7 @@
 #include "run-command.h"
 #include "hook.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "object.h"
 #include "path.h"
 #include "submodule.h"

diff --git a/remote.c b/remote.c
index 4099183cacdc8a607a8b5eaec86e456b2ef46b48..17a842f56847464d28daf6188414d88b40351d64 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -12,7 +12,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "commit.h"
 #include "diff.h"

diff --git a/replace-object.c b/replace-object.c
index f8c5f68837f12ec63d1744e92b6d663a9f0798cc..3eae0510745eae0b6d1481167a12d10cc0f65e71 100644 (file)
--- a/replace-object.c
+++ b/replace-object.c
@@ -2,7 +2,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "oidmap.h"
-#include "object-store.h"
+#include "odb.h"
 #include "replace-object.h"
 #include "refs.h"
 #include "repository.h"

diff --git a/replace-object.h b/replace-object.h
index 3052e96a6203fdaa7354be39a1d5f26408adc86e..4c9f2a2383d577541d08ac4f8c108abba45db2e5 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -3,7 +3,7 @@
 
 #include "oidmap.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 
 struct replace_object {
        struct oidmap_entry original;

diff --git a/repository.c b/repository.c
index 7528beccddf136a8fb4a39b96f4a5b16ed6e3a00..13426db0f2be268e282d6bf8276018673635f7f5 100644 (file)
--- a/repository.c
+++ b/repository.c
@@ -1,7 +1,7 @@
 #include "git-compat-util.h"
 #include "abspath.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 #include "config.h"
 #include "object.h"
 #include "lockfile.h"

diff --git a/rerere.c b/rerere.c
index 3cd37c5f0ae70c836b3f621bda1d8660c548bfb4..951e4bf8b41c95f3febb86c5a651097a4eeae6f3 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -18,7 +18,7 @@
 #include "path.h"
 #include "pathspec.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "strmap.h"
 
 #define RESOLVED 0

diff --git a/revision.c b/revision.c
index 2c36a9c179efb5ae8b9ed907f19a645b74ac7cb4..cdefe7d6e482cb944413f90d094a41baf1280876 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -8,7 +8,7 @@
 #include "hex.h"
 #include "object-name.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oidset.h"
 #include "tag.h"
 #include "blob.h"

diff --git a/send-pack.c b/send-pack.c
index 86592ce526db95bb4b13c2c6b19d604a464755ff..abca2dd38a78ba9e88638aad5b643afdfb808195 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -4,7 +4,7 @@
 #include "date.h"
 #include "gettext.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pkt-line.h"
 #include "sideband.h"
 #include "run-command.h"

diff --git a/sequencer.c b/sequencer.c
index 1ee0abbd4514f2509fe41a14fabc0c2044b096a2..2432d0a39ec66988f9109952d9db7e5a82bd0060 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -13,7 +13,7 @@
 #include "dir.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "object.h"
 #include "pager.h"
 #include "commit.h"

diff --git a/server-info.c b/server-info.c
index d6cd20a39d74fc064d80f59d5a4b579c6682fb93..9bb30d9ab71d2231905a031a7e8f173e31585a67 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -11,7 +11,7 @@
 #include "packfile.h"
 #include "path.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "server-info.h"
 #include "strbuf.h"
 #include "tempfile.h"

diff --git a/shallow.c b/shallow.c
index faeeeb45f986e13065290712e16a800f46b42364..d379756e39a67a18929b62e5180f6eb479fea9af 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -5,7 +5,7 @@
 #include "repository.h"
 #include "tempfile.h"
 #include "lockfile.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "tag.h"
 #include "pkt-line.h"

diff --git a/streaming.c b/streaming.c
index 6d6512e2e0d6d9e43e3bed0a0f46ba5a9c9bca59..81c42673a235fa2cebd55ac6837e998829f89463 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -10,7 +10,7 @@
 #include "streaming.h"
 #include "repository.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "replace-object.h"
 #include "packfile.h"
 

diff --git a/submodule-config.c b/submodule-config.c
index b30d9365fbdb9b49daf2f3875fa443daae25cb28..9c80f9f7b666086c2e20b208932f38158811d6c8 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -13,7 +13,7 @@
 #include "submodule.h"
 #include "strbuf.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "parse-options.h"
 #include "thread-utils.h"
 #include "tree-walk.h"

diff --git a/submodule.c b/submodule.c
index ead3fb5dadca3a8689453df52ac0a414dd22df1e..9b1018877df8b74c93998a9a6a4a433f5f415422 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -27,7 +27,7 @@
 #include "parse-options.h"
 #include "object-file.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit-reach.h"
 #include "read-cache-ll.h"
 #include "setup.h"

diff --git a/t/helper/test-find-pack.c b/t/helper/test-find-pack.c
index 76c2f4eba85f2ccdf3e9b53caec8b7a353b20a19..611a13a32610d2f291d89ef1aca12aab1383c335 100644 (file)
--- a/t/helper/test-find-pack.c
+++ b/t/helper/test-find-pack.c
@@ -2,7 +2,7 @@
 
 #include "test-tool.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "parse-options.h"
 #include "setup.h"

diff --git a/t/helper/test-pack-mtimes.c b/t/helper/test-pack-mtimes.c
index fdf1b13437bd79522471a2b32d2e14eebb809e16..d51aaa3dc40d1287c60d2058b94404df777e7ee4 100644 (file)
--- a/t/helper/test-pack-mtimes.c
+++ b/t/helper/test-pack-mtimes.c
@@ -3,7 +3,7 @@
 #include "test-tool.h"
 #include "hex.h"
 #include "strbuf.h"
-#include "object-store.h"
+#include "odb.h"
 #include "packfile.h"
 #include "pack-mtimes.h"
 #include "setup.h"

diff --git a/t/helper/test-partial-clone.c b/t/helper/test-partial-clone.c
index 34f1aee55817624a3668b9f9327b5959c995c46d..dba227259a26292d2a21e8ea983e2923c1ca8e56 100644 (file)
--- a/t/helper/test-partial-clone.c
+++ b/t/helper/test-partial-clone.c
@@ -1,7 +1,7 @@
 #include "test-tool.h"
 #include "hex.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 #include "setup.h"
 
 /*

diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
index 53b633e2ba6690aeb26b4cb90a06116d1e019ac6..ef5339bbee9553212a92df59f6386f188a61d402 100644 (file)
--- a/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@ -3,7 +3,7 @@
 #include "test-tool.h"
 #include "commit-graph.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 #include "bloom.h"
 #include "setup.h"
 

diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index ac81390899aef0b5bb909e4923f30ffb463a6c74..da2aa036b57ef6f0c96b1e15d711fac125c2d687 100644 (file)
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -4,7 +4,7 @@
 #include "hex.h"
 #include "midx.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 #include "pack-bitmap.h"
 #include "packfile.h"
 #include "setup.h"

diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 4cfc7c90b59bead04915b798504af760dfb407b4..2920ca59d72f5323d25bf174dd0d650d022eca42 100644 (file)
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -5,7 +5,7 @@
 #include "refs.h"
 #include "setup.h"
 #include "worktree.h"
-#include "object-store.h"
+#include "odb.h"
 #include "path.h"
 #include "repository.h"
 #include "strbuf.h"

diff --git a/tag.c b/tag.c
index 05be39067cfe4ee82234793a19969f23f61bfa86..5f6868bf7b12a4c33be8f225739996e04a483d62 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -5,7 +5,7 @@
 #include "environment.h"
 #include "tag.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "tree.h"
 #include "blob.h"

diff --git a/tmp-objdir.c b/tmp-objdir.c
index 056484404be0bf2c246f1e9141db32f405572f14..bef2f917cd2f2a84cc3c3a86e202e21235990b5c 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -10,7 +10,7 @@
 #include "strbuf.h"
 #include "strvec.h"
 #include "quote.h"
-#include "object-store.h"
+#include "odb.h"
 #include "repository.h"
 
 struct tmp_objdir {

diff --git a/tree-walk.c b/tree-walk.c
index 90655d523783196ddf661a9986cb95fb81f3b309..34b0fff4873dbd57a9a073fe780bb056178e463c 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -6,7 +6,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "object-file.h"
-#include "object-store.h"
+#include "odb.h"
 #include "trace2.h"
 #include "tree.h"
 #include "pathspec.h"

diff --git a/tree.c b/tree.c
index b85f56267fb3bb2469805e48f9d89eeef1aa5a2a..341b7c2ff3fb9f3ad2d351162d2ac758e18f8112 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -4,7 +4,7 @@
 #include "hex.h"
 #include "tree.h"
 #include "object-name.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "alloc.h"
 #include "tree-walk.h"

diff --git a/unpack-trees.c b/unpack-trees.c
index 471837f0329d63a2fdacef1427874a5a59dd0415..f38c761ab987a6647ffd414253c81e608d9c67a7 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -26,7 +26,7 @@
 #include "symlinks.h"
 #include "trace2.h"
 #include "fsmonitor.h"
-#include "object-store.h"
+#include "odb.h"
 #include "promisor-remote.h"
 #include "entry.h"
 #include "parallel-checkout.h"

diff --git a/upload-pack.c b/upload-pack.c
index 26f29b85b551c192d8f0b7a1815d5db9014638d6..e994d6a901b6679111083dbd276c11749943430b 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -10,7 +10,7 @@
 #include "pkt-line.h"
 #include "sideband.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 #include "oid-array.h"
 #include "object.h"
 #include "commit.h"

diff --git a/walker.c b/walker.c
index b470d43e54d486c370651be98eb1d0dc0da39434..a8abe8a2e78ee53bdac18b9638345c949e3c17a9 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -5,7 +5,7 @@
 #include "hex.h"
 #include "walker.h"
 #include "repository.h"
-#include "object-store.h"
+#include "odb.h"
 #include "commit.h"
 #include "strbuf.h"
 #include "tree.h"

diff --git a/xdiff-interface.c b/xdiff-interface.c
index 1edcd319e6ef2cad54b482b8db42b42e1384cb27..01e6e378ea6071075c48bbf85b08ac6a97ad119d 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -5,7 +5,7 @@
 #include "gettext.h"
 #include "config.h"
 #include "hex.h"
-#include "object-store.h"
+#include "odb.h"
 #include "strbuf.h"
 #include "xdiff-interface.h"
 #include "xdiff/xtypes.h"