Skip to content

Commit a034e91

Browse files
newrengitster
newren
authored and
gitster
committed
object-store-ll.h: split this header out of object-store.h
The vast majority of files including object-store.h did not need dir.h nor khash.h. Split the header into two files, and let most just depend upon object-store-ll.h, while letting the two callers that need it depend on the full object-store.h. After this patch: $ git grep -h include..object-store | sort | uniq -c 2 #include "object-store.h" 129 #include "object-store-ll.h" Diff best viewed with `--color-moved`. Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8043418 commit a034e91

File tree

131 files changed

+677
-655
lines changed

Some content is hidden

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

131 files changed

+677
-655
lines changed

‎apply.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "alloc.h"
1313
#include "base85.h"
1414
#include "config.h"
15-
#include "object-store.h"
15+
#include "object-store-ll.h"
1616
#include "blob.h"
1717
#include "delta.h"
1818
#include "diff.h"

‎archive-tar.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "hex.h"
1010
#include "tar.h"
1111
#include "archive.h"
12-
#include "object-store.h"
12+
#include "object-store-ll.h"
1313
#include "streaming.h"
1414
#include "run-command.h"
1515
#include "write-or-die.h"

‎archive-zip.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "hex.h"
1010
#include "streaming.h"
1111
#include "utf8.h"
12-
#include "object-store.h"
12+
#include "object-store-ll.h"
1313
#include "userdiff.h"
1414
#include "write-or-die.h"
1515
#include "xdiff-interface.h"

‎archive.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "pretty.h"
1111
#include "setup.h"
1212
#include "refs.h"
13-
#include "object-store.h"
13+
#include "object-store-ll.h"
1414
#include "commit.h"
1515
#include "tree.h"
1616
#include "tree-walk.h"

‎attr.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "quote.h"
2020
#include "read-cache-ll.h"
2121
#include "revision.h"
22-
#include "object-store.h"
22+
#include "object-store-ll.h"
2323
#include "setup.h"
2424
#include "thread-utils.h"
2525
#include "tree-walk.h"

‎bisect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "commit-slab.h"
1919
#include "commit-reach.h"
2020
#include "object-name.h"
21-
#include "object-store.h"
21+
#include "object-store-ll.h"
2222
#include "path.h"
2323
#include "dir.h"
2424

‎blame.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "git-compat-util.h"
22
#include "refs.h"
3-
#include "object-store.h"
3+
#include "object-store-ll.h"
44
#include "cache-tree.h"
55
#include "mergesort.h"
66
#include "convert.h"

‎builtin/blame.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "dir.h"
3030
#include "progress.h"
3131
#include "object-name.h"
32-
#include "object-store.h"
32+
#include "object-store-ll.h"
3333
#include "pager.h"
3434
#include "blame.h"
3535
#include "refs.h"

‎builtin/cat-file.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "packfile.h"
2222
#include "object-file.h"
2323
#include "object-name.h"
24-
#include "object-store.h"
24+
#include "object-store-ll.h"
2525
#include "replace-object.h"
2626
#include "promisor-remote.h"
2727
#include "mailmap.h"

‎builtin/checkout.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "mem-pool.h"
1919
#include "merge-recursive.h"
2020
#include "object-name.h"
21-
#include "object-store.h"
21+
#include "object-store-ll.h"
2222
#include "parse-options.h"
2323
#include "path.h"
2424
#include "preload-index.h"

‎builtin/clone.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "refs.h"
2424
#include "refspec.h"
2525
#include "object-file.h"
26-
#include "object-store.h"
26+
#include "object-store-ll.h"
2727
#include "tree.h"
2828
#include "tree-walk.h"
2929
#include "unpack-trees.h"

‎builtin/commit-graph.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "parse-options.h"
1010
#include "repository.h"
1111
#include "commit-graph.h"
12-
#include "object-store.h"
12+
#include "object-store-ll.h"
1313
#include "progress.h"
1414
#include "replace-object.h"
1515
#include "tag.h"

‎builtin/commit-tree.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "gettext.h"
99
#include "hex.h"
1010
#include "object-name.h"
11-
#include "object-store.h"
11+
#include "object-store-ll.h"
1212
#include "repository.h"
1313
#include "commit.h"
1414
#include "tree.h"

‎builtin/count-objects.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "parse-options.h"
1515
#include "quote.h"
1616
#include "packfile.h"
17-
#include "object-store.h"
17+
#include "object-store-ll.h"
1818

1919
static unsigned long garbage;
2020
static off_t size_garbage;

‎builtin/describe.c

+1-1
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.h"
22+
#include "object-store-ll.h"
2323
#include "list-objects.h"
2424
#include "commit-slab.h"
2525
#include "wildmatch.h"

‎builtin/difftool.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "strbuf.h"
2929
#include "lockfile.h"
3030
#include "object-file.h"
31-
#include "object-store.h"
31+
#include "object-store-ll.h"
3232
#include "dir.h"
3333
#include "entry.h"
3434
#include "setup.h"

‎builtin/fast-export.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "refs.h"
1111
#include "refspec.h"
1212
#include "object-file.h"
13-
#include "object-store.h"
13+
#include "object-store-ll.h"
1414
#include "commit.h"
1515
#include "object.h"
1616
#include "tag.h"

‎builtin/fast-import.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "packfile.h"
2222
#include "object-file.h"
2323
#include "object-name.h"
24-
#include "object-store.h"
24+
#include "object-store-ll.h"
2525
#include "mem-pool.h"
2626
#include "commit-reach.h"
2727
#include "khash.h"

‎builtin/fetch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "refs.h"
1212
#include "refspec.h"
1313
#include "object-name.h"
14-
#include "object-store.h"
14+
#include "object-store-ll.h"
1515
#include "oidset.h"
1616
#include "oid-array.h"
1717
#include "commit.h"

‎builtin/fsck.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "packfile.h"
2121
#include "object-file.h"
2222
#include "object-name.h"
23-
#include "object-store.h"
23+
#include "object-store-ll.h"
2424
#include "path.h"
2525
#include "read-cache-ll.h"
2626
#include "replace-object.h"

‎builtin/gc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "commit-graph.h"
2828
#include "packfile.h"
2929
#include "object-file.h"
30-
#include "object-store.h"
30+
#include "object-store-ll.h"
3131
#include "pack.h"
3232
#include "pack-objects.h"
3333
#include "path.h"

‎builtin/grep.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "submodule-config.h"
2828
#include "object-file.h"
2929
#include "object-name.h"
30-
#include "object-store.h"
30+
#include "object-store-ll.h"
3131
#include "packfile.h"
3232
#include "pager.h"
3333
#include "path.h"

‎builtin/hash-object.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
#include "gettext.h"
1111
#include "hex.h"
1212
#include "object-file.h"
13-
#include "object-store.h"
13+
#include "object-store-ll.h"
1414
#include "blob.h"
1515
#include "quote.h"
1616
#include "parse-options.h"
1717
#include "exec-cmd.h"
1818
#include "setup.h"
19+
#include "strbuf.h"
1920
#include "write-or-die.h"
2021

2122
/*

‎builtin/index-pack.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
#include "progress.h"
1515
#include "fsck.h"
1616
#include "exec-cmd.h"
17+
#include "strbuf.h"
1718
#include "streaming.h"
1819
#include "thread-utils.h"
1920
#include "packfile.h"
2021
#include "pack-revindex.h"
2122
#include "object-file.h"
22-
#include "object-store.h"
23+
#include "object-store-ll.h"
2324
#include "oid-array.h"
2425
#include "replace-object.h"
2526
#include "promisor-remote.h"

‎builtin/log.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "refs.h"
1515
#include "object-file.h"
1616
#include "object-name.h"
17-
#include "object-store.h"
17+
#include "object-store-ll.h"
1818
#include "pager.h"
1919
#include "color.h"
2020
#include "commit.h"

‎builtin/ls-tree.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "gettext.h"
99
#include "hex.h"
1010
#include "object-name.h"
11-
#include "object-store.h"
11+
#include "object-store-ll.h"
1212
#include "blob.h"
1313
#include "tree.h"
1414
#include "commit.h"

‎builtin/merge-tree.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "commit-reach.h"
1010
#include "merge-ort.h"
1111
#include "object-name.h"
12-
#include "object-store.h"
12+
#include "object-store-ll.h"
1313
#include "parse-options.h"
1414
#include "repository.h"
1515
#include "blob.h"

‎builtin/mktag.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
#include "gettext.h"
33
#include "hex.h"
44
#include "parse-options.h"
5+
#include "strbuf.h"
56
#include "tag.h"
67
#include "replace-object.h"
78
#include "object-file.h"
8-
#include "object-store.h"
9+
#include "object-store-ll.h"
910
#include "fsck.h"
1011
#include "config.h"
1112

‎builtin/mktree.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
#include "gettext.h"
99
#include "hex.h"
1010
#include "quote.h"
11+
#include "strbuf.h"
1112
#include "tree.h"
1213
#include "parse-options.h"
13-
#include "object-store.h"
14+
#include "object-store-ll.h"
1415

1516
static struct treeent {
1617
unsigned mode;

‎builtin/multi-pack-index.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
#include "gettext.h"
66
#include "parse-options.h"
77
#include "midx.h"
8+
#include "strbuf.h"
89
#include "trace2.h"
9-
#include "object-store.h"
10+
#include "object-store-ll.h"
1011

1112
#define BUILTIN_MIDX_WRITE_USAGE \
1213
N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]" \

‎builtin/notes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "hex.h"
1515
#include "notes.h"
1616
#include "object-name.h"
17-
#include "object-store.h"
17+
#include "object-store-ll.h"
1818
#include "path.h"
1919
#include "repository.h"
2020
#include "blob.h"

‎builtin/pack-objects.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "list.h"
3535
#include "packfile.h"
3636
#include "object-file.h"
37-
#include "object-store.h"
37+
#include "object-store-ll.h"
3838
#include "replace-object.h"
3939
#include "dir.h"
4040
#include "midx.h"

‎builtin/pack-redundant.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "hex.h"
1212
#include "repository.h"
1313
#include "packfile.h"
14-
#include "object-store.h"
14+
#include "object-store-ll.h"
1515

1616
#define BLKSIZE 512
1717

‎builtin/prune.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include "builtin.h"
22
#include "commit.h"
33
#include "diff.h"
4+
#include "dir.h"
45
#include "environment.h"
56
#include "gettext.h"
67
#include "hex.h"
@@ -13,7 +14,7 @@
1314
#include "replace-object.h"
1415
#include "object-file.h"
1516
#include "object-name.h"
16-
#include "object-store.h"
17+
#include "object-store-ll.h"
1718
#include "shallow.h"
1819

1920
static const char * const prune_usage[] = {

‎builtin/receive-pack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "oidset.h"
3131
#include "packfile.h"
3232
#include "object-name.h"
33-
#include "object-store.h"
33+
#include "object-store-ll.h"
3434
#include "path.h"
3535
#include "protocol.h"
3636
#include "commit-reach.h"

‎builtin/remote.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "rebase.h"
1212
#include "refs.h"
1313
#include "refspec.h"
14-
#include "object-store.h"
14+
#include "object-store-ll.h"
1515
#include "strvec.h"
1616
#include "commit-reach.h"
1717
#include "progress.h"

‎builtin/repack.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "midx.h"
1717
#include "packfile.h"
1818
#include "prune-packed.h"
19-
#include "object-store.h"
19+
#include "object-store-ll.h"
2020
#include "promisor-remote.h"
2121
#include "shallow.h"
2222
#include "pack.h"

‎builtin/replace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "run-command.h"
2121
#include "object-file.h"
2222
#include "object-name.h"
23-
#include "object-store.h"
23+
#include "object-store-ll.h"
2424
#include "replace-object.h"
2525
#include "repository.h"
2626
#include "tag.h"

‎builtin/rev-list.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "object.h"
1313
#include "object-name.h"
1414
#include "object-file.h"
15-
#include "object-store.h"
15+
#include "object-store-ll.h"
1616
#include "pack.h"
1717
#include "pack-bitmap.h"
1818
#include "log-tree.h"

‎builtin/show-ref.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "hex.h"
55
#include "refs.h"
66
#include "object-name.h"
7-
#include "object-store.h"
7+
#include "object-store-ll.h"
88
#include "object.h"
99
#include "tag.h"
1010
#include "string-list.h"

‎builtin/submodule--helper.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "diff.h"
3030
#include "object-file.h"
3131
#include "object-name.h"
32-
#include "object-store.h"
32+
#include "object-store-ll.h"
3333
#include "advice.h"
3434
#include "branch.h"
3535
#include "list-objects-filter-options.h"

0 commit comments

Comments
 (0)