Skip to content

Commit 80c7c79

Browse files
pks-tgitster
pks-t
authored and
gitster
committed
object-store: merge "object-store-ll.h" and "object-store.h"
The "object-store-ll.h" header has been introduced to keep transitive header dependendcies and compile times at bay. Now that we have created a new "object-store.c" file though we can easily move the last remaining additional bit of "object-store.h", the `odb_path_map`, out of the header. Do so. As the "object-store.h" header is now equivalent to its low-level alternative we drop the latter and inline it into the former. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 080035a commit 80c7c79

File tree

124 files changed

+637
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+637
-642
lines changed

‎apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "abspath.h"
1515
#include "base85.h"
1616
#include "config.h"
17-
#include "object-store-ll.h"
17+
#include "object-store.h"
1818
#include "delta.h"
1919
#include "diff.h"
2020
#include "dir.h"

‎archive-tar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "hex.h"
1212
#include "tar.h"
1313
#include "archive.h"
14-
#include "object-store-ll.h"
14+
#include "object-store.h"
1515
#include "strbuf.h"
1616
#include "streaming.h"
1717
#include "run-command.h"

‎archive-zip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "hex.h"
1313
#include "streaming.h"
1414
#include "utf8.h"
15-
#include "object-store-ll.h"
15+
#include "object-store.h"
1616
#include "strbuf.h"
1717
#include "userdiff.h"
1818
#include "write-or-die.h"

‎archive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "pretty.h"
1515
#include "setup.h"
1616
#include "refs.h"
17-
#include "object-store-ll.h"
17+
#include "object-store.h"
1818
#include "commit.h"
1919
#include "tree.h"
2020
#include "tree-walk.h"

‎attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "read-cache-ll.h"
2323
#include "refs.h"
2424
#include "revision.h"
25-
#include "object-store-ll.h"
25+
#include "object-store.h"
2626
#include "setup.h"
2727
#include "thread-utils.h"
2828
#include "tree-walk.h"

‎bisect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "commit-slab.h"
2121
#include "commit-reach.h"
2222
#include "object-name.h"
23-
#include "object-store-ll.h"
23+
#include "object-store.h"
2424
#include "path.h"
2525
#include "dir.h"
2626

‎blame.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "git-compat-util.h"
55
#include "refs.h"
6-
#include "object-store-ll.h"
6+
#include "object-store.h"
77
#include "cache-tree.h"
88
#include "mergesort.h"
99
#include "commit.h"

‎builtin/backfill.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "tree.h"
1414
#include "tree-walk.h"
1515
#include "object.h"
16-
#include "object-store-ll.h"
16+
#include "object-store.h"
1717
#include "oid-array.h"
1818
#include "oidset.h"
1919
#include "promisor-remote.h"

‎builtin/blame.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "line-log.h"
2929
#include "progress.h"
3030
#include "object-name.h"
31-
#include "object-store-ll.h"
31+
#include "object-store.h"
3232
#include "pager.h"
3333
#include "blame.h"
3434
#include "refs.h"

‎builtin/cat-file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "packfile.h"
2323
#include "object-file.h"
2424
#include "object-name.h"
25-
#include "object-store-ll.h"
25+
#include "object-store.h"
2626
#include "replace-object.h"
2727
#include "promisor-remote.h"
2828
#include "mailmap.h"

‎builtin/checkout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "merge-recursive.h"
2121
#include "object-file.h"
2222
#include "object-name.h"
23-
#include "object-store-ll.h"
23+
#include "object-store.h"
2424
#include "parse-options.h"
2525
#include "path.h"
2626
#include "preload-index.h"

‎builtin/clone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "refs.h"
2626
#include "refspec.h"
2727
#include "object-file.h"
28-
#include "object-store-ll.h"
28+
#include "object-store.h"
2929
#include "tree.h"
3030
#include "tree-walk.h"
3131
#include "unpack-trees.h"

‎builtin/commit-graph.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "hex.h"
77
#include "parse-options.h"
88
#include "commit-graph.h"
9-
#include "object-store-ll.h"
9+
#include "object-store.h"
1010
#include "progress.h"
1111
#include "replace-object.h"
1212
#include "strbuf.h"

‎builtin/commit-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "gettext.h"
1010
#include "hex.h"
1111
#include "object-name.h"
12-
#include "object-store-ll.h"
12+
#include "object-store.h"
1313

1414
#include "commit.h"
1515
#include "parse-options.h"

‎builtin/count-objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "parse-options.h"
1313
#include "quote.h"
1414
#include "packfile.h"
15-
#include "object-store-ll.h"
15+
#include "object-store.h"
1616

1717
static unsigned long garbage;
1818
static off_t size_garbage;

‎builtin/describe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "setup.h"
2020
#include "strvec.h"
2121
#include "run-command.h"
22-
#include "object-store-ll.h"
22+
#include "object-store.h"
2323
#include "list-objects.h"
2424
#include "commit-slab.h"
2525
#include "wildmatch.h"

‎builtin/difftool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "strbuf.h"
3030
#include "lockfile.h"
3131
#include "object-file.h"
32-
#include "object-store-ll.h"
32+
#include "object-store.h"
3333
#include "dir.h"
3434
#include "entry.h"
3535
#include "setup.h"

‎builtin/fast-export.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "refs.h"
1515
#include "refspec.h"
1616
#include "object-file.h"
17-
#include "object-store-ll.h"
17+
#include "object-store.h"
1818
#include "commit.h"
1919
#include "object.h"
2020
#include "tag.h"

‎builtin/fast-import.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "packfile.h"
2525
#include "object-file.h"
2626
#include "object-name.h"
27-
#include "object-store-ll.h"
27+
#include "object-store.h"
2828
#include "mem-pool.h"
2929
#include "commit-reach.h"
3030
#include "khash.h"

‎builtin/fetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "refs.h"
1515
#include "refspec.h"
1616
#include "object-name.h"
17-
#include "object-store-ll.h"
17+
#include "object-store.h"
1818
#include "oidset.h"
1919
#include "oid-array.h"
2020
#include "commit.h"

‎builtin/fsck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "packfile.h"
1919
#include "object-file.h"
2020
#include "object-name.h"
21-
#include "object-store-ll.h"
21+
#include "object-store.h"
2222
#include "path.h"
2323
#include "read-cache-ll.h"
2424
#include "replace-object.h"

‎builtin/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "commit.h"
3030
#include "commit-graph.h"
3131
#include "packfile.h"
32-
#include "object-store-ll.h"
32+
#include "object-store.h"
3333
#include "pack.h"
3434
#include "pack-objects.h"
3535
#include "path.h"

‎builtin/grep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "submodule-config.h"
2727
#include "object-file.h"
2828
#include "object-name.h"
29-
#include "object-store-ll.h"
29+
#include "object-store.h"
3030
#include "packfile.h"
3131
#include "pager.h"
3232
#include "path.h"

‎builtin/hash-object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "gettext.h"
1212
#include "hex.h"
1313
#include "object-file.h"
14-
#include "object-store-ll.h"
14+
#include "object-store.h"
1515
#include "blob.h"
1616
#include "quote.h"
1717
#include "parse-options.h"

‎builtin/index-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "packfile.h"
2222
#include "pack-revindex.h"
2323
#include "object-file.h"
24-
#include "object-store-ll.h"
24+
#include "object-store.h"
2525
#include "oid-array.h"
2626
#include "oidset.h"
2727
#include "path.h"

‎builtin/log.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "hex.h"
1717
#include "refs.h"
1818
#include "object-name.h"
19-
#include "object-store-ll.h"
19+
#include "object-store.h"
2020
#include "pager.h"
2121
#include "color.h"
2222
#include "commit.h"

‎builtin/ls-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "gettext.h"
1111
#include "hex.h"
1212
#include "object-name.h"
13-
#include "object-store-ll.h"
13+
#include "object-store.h"
1414
#include "tree.h"
1515
#include "path.h"
1616
#include "quote.h"

‎builtin/merge-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "commit-reach.h"
1111
#include "merge-ort.h"
1212
#include "object-name.h"
13-
#include "object-store-ll.h"
13+
#include "object-store.h"
1414
#include "parse-options.h"
1515
#include "blob.h"
1616
#include "merge-blobs.h"

‎builtin/mktag.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "strbuf.h"
77
#include "replace-object.h"
88
#include "object-file.h"
9-
#include "object-store-ll.h"
9+
#include "object-store.h"
1010
#include "fsck.h"
1111
#include "config.h"
1212

‎builtin/mktree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "tree.h"
1313
#include "parse-options.h"
1414
#include "object-file.h"
15-
#include "object-store-ll.h"
15+
#include "object-store.h"
1616

1717
static struct treeent {
1818
unsigned mode;

‎builtin/multi-pack-index.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "midx.h"
88
#include "strbuf.h"
99
#include "trace2.h"
10-
#include "object-store-ll.h"
10+
#include "object-store.h"
1111
#include "replace-object.h"
1212
#include "repository.h"
1313

‎builtin/notes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "notes.h"
1717
#include "object-file.h"
1818
#include "object-name.h"
19-
#include "object-store-ll.h"
19+
#include "object-store.h"
2020
#include "path.h"
2121

2222
#include "pretty.h"

‎builtin/pack-objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "list.h"
3333
#include "packfile.h"
3434
#include "object-file.h"
35-
#include "object-store-ll.h"
35+
#include "object-store.h"
3636
#include "replace-object.h"
3737
#include "dir.h"
3838
#include "midx.h"

‎builtin/pack-redundant.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "hex.h"
1414

1515
#include "packfile.h"
16-
#include "object-store-ll.h"
16+
#include "object-store.h"
1717
#include "strbuf.h"
1818

1919
#define BLKSIZE 512

‎builtin/prune.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "replace-object.h"
1818
#include "object-file.h"
1919
#include "object-name.h"
20-
#include "object-store-ll.h"
20+
#include "object-store.h"
2121
#include "shallow.h"
2222

2323
static const char * const prune_usage[] = {

‎builtin/receive-pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "packfile.h"
3434
#include "object-file.h"
3535
#include "object-name.h"
36-
#include "object-store-ll.h"
36+
#include "object-store.h"
3737
#include "path.h"
3838
#include "protocol.h"
3939
#include "commit-reach.h"

‎builtin/remote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "rebase.h"
1515
#include "refs.h"
1616
#include "refspec.h"
17-
#include "object-store-ll.h"
17+
#include "object-store.h"
1818
#include "strvec.h"
1919
#include "commit-reach.h"
2020
#include "progress.h"

‎builtin/repack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "midx.h"
1818
#include "packfile.h"
1919
#include "prune-packed.h"
20-
#include "object-store-ll.h"
20+
#include "object-store.h"
2121
#include "promisor-remote.h"
2222
#include "shallow.h"
2323
#include "pack.h"

‎builtin/replace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "run-command.h"
2020
#include "object-file.h"
2121
#include "object-name.h"
22-
#include "object-store-ll.h"
22+
#include "object-store.h"
2323
#include "read-cache.h"
2424
#include "replace-object.h"
2525
#include "tag.h"

‎builtin/rev-list.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "object.h"
1515
#include "object-name.h"
1616
#include "object-file.h"
17-
#include "object-store-ll.h"
17+
#include "object-store.h"
1818
#include "pack-bitmap.h"
1919
#include "log-tree.h"
2020
#include "graph.h"

‎builtin/show-ref.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "hex.h"
66
#include "refs/refs-internal.h"
77
#include "object-name.h"
8-
#include "object-store-ll.h"
8+
#include "object-store.h"
99
#include "object.h"
1010
#include "string-list.h"
1111
#include "parse-options.h"

‎builtin/submodule--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "diff.h"
2929
#include "object-file.h"
3030
#include "object-name.h"
31-
#include "object-store-ll.h"
31+
#include "object-store.h"
3232
#include "advice.h"
3333
#include "branch.h"
3434
#include "list-objects-filter-options.h"

‎builtin/tag.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "refs.h"
2020
#include "object-file.h"
2121
#include "object-name.h"
22-
#include "object-store-ll.h"
22+
#include "object-store.h"
2323
#include "path.h"
2424
#include "tag.h"
2525
#include "parse-options.h"

‎builtin/unpack-file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "hex.h"
55
#include "object-file.h"
66
#include "object-name.h"
7-
#include "object-store-ll.h"
7+
#include "object-store.h"
88

99
static char *create_temp_file(struct object_id *oid)
1010
{

0 commit comments

Comments
 (0)