87bed17907 · matheusbsbs/matheus-bagliano

apply.c

+1

@@ -23,6 +23,7 @@

23 #include "ll-merge.h"

24 #include "lockfile.h"

25 #include "object-name.h"

26 +#include "object-file.h"

27 #include "parse-options.h"

28 #include "quote.h"

29 #include "rerere.h"

builtin/bugreport.c

+1

@@ -8,6 +8,7 @@

8 #include "hook.h"

9 #include "hook-list.h"

10 #include "diagnose.h"

11 +#include "object-file.h"

12 #include "setup.h"

13 #include "wrapper.h"

14

builtin/cat-file.c

+1

@@ -20,6 +20,7 @@

20 #include "tree-walk.h"

21 #include "oid-array.h"

22 #include "packfile.h"

23 +#include "object-file.h"

24 #include "object-name.h"

25 #include "object-store.h"

26 #include "replace-object.h"

builtin/clone.c

+1

@@ -21,6 +21,7 @@

21 #include "fetch-pack.h"

22 #include "refs.h"

23 #include "refspec.h"

24 +#include "object-file.h"

25 #include "object-store.h"

26 #include "tree.h"

27 #include "tree-walk.h"

builtin/credential-cache--daemon.c

+1

@@ -2,6 +2,7 @@

2 #include "abspath.h"

3 #include "alloc.h"

4 #include "gettext.h"

5 +#include "object-file.h"

6 #include "parse-options.h"

7

8 #ifndef NO_UNIX_SOCKETS

builtin/diagnose.c

+1

@@ -1,6 +1,7 @@

1 #include "builtin.h"

2 #include "abspath.h"

3 #include "gettext.h"

4 +#include "object-file.h"

5 #include "parse-options.h"

6 #include "diagnose.h"

7

builtin/difftool.c

+1

@@ -25,6 +25,7 @@

25 #include "strvec.h"

26 #include "strbuf.h"

27 #include "lockfile.h"

28 +#include "object-file.h"

29 #include "object-store.h"

30 #include "dir.h"

31 #include "entry.h"

builtin/fast-export.c

+1

@@ -10,6 +10,7 @@

10 #include "hex.h"

11 #include "refs.h"

12 #include "refspec.h"

13 +#include "object-file.h"

14 #include "object-store.h"

15 #include "commit.h"

16 #include "object.h"

builtin/fast-import.c

+1

@@ -19,6 +19,7 @@

19 #include "dir.h"

20 #include "run-command.h"

21 #include "packfile.h"

22 +#include "object-file.h"

23 #include "object-name.h"

24 #include "object-store.h"

25 #include "mem-pool.h"

builtin/fetch-pack.c

+1

@@ -2,6 +2,7 @@

2 #include "alloc.h"

3 #include "gettext.h"

4 #include "hex.h"

5 +#include "object-file.h"

6 #include "pkt-line.h"

7 #include "fetch-pack.h"

8 #include "remote.h"

builtin/fsck.c

+1

@@ -19,6 +19,7 @@

19 #include "streaming.h"

20 #include "decorate.h"

21 #include "packfile.h"

22 +#include "object-file.h"

23 #include "object-name.h"

24 #include "object-store.h"

25 #include "replace-object.h"

builtin/gc.c

+1

@@ -25,6 +25,7 @@

25 #include "commit.h"

26 #include "commit-graph.h"

27 #include "packfile.h"

28 +#include "object-file.h"

29 #include "object-store.h"

30 #include "pack.h"

31 #include "pack-objects.h"

builtin/grep.c

+1

@@ -26,6 +26,7 @@

26 #include "setup.h"

27 #include "submodule.h"

28 #include "submodule-config.h"

29 +#include "object-file.h"

30 #include "object-name.h"

31 #include "object-store.h"

32 #include "packfile.h"

builtin/hash-object.c

+1

@@ -9,6 +9,7 @@

9 #include "config.h"

10 #include "gettext.h"

11 #include "hex.h"

12 +#include "object-file.h"

13 #include "object-store.h"

14 #include "blob.h"

15 #include "quote.h"

builtin/index-pack.c

+1

@@ -18,6 +18,7 @@

18 #include "thread-utils.h"

19 #include "packfile.h"

20 #include "pack-revindex.h"

21 +#include "object-file.h"

22 #include "object-store.h"

23 #include "oid-array.h"

24 #include "replace-object.h"

builtin/init-db.c

+1

@@ -11,6 +11,7 @@

11 #include "refs.h"

12 #include "builtin.h"

13 #include "exec-cmd.h"

14 +#include "object-file.h"

15 #include "parse-options.h"

16 #include "setup.h"

17 #include "worktree.h"

builtin/log.c

+1

@@ -12,6 +12,7 @@

12 #include "gettext.h"

13 #include "hex.h"

14 #include "refs.h"

15 +#include "object-file.h"

16 #include "object-name.h"

17 #include "object-store.h"

18 #include "color.h"

builtin/mktag.c

+1

@@ -4,6 +4,7 @@

4 #include "parse-options.h"

5 #include "tag.h"

6 #include "replace-object.h"

7 +#include "object-file.h"

8 #include "object-store.h"

9 #include "fsck.h"

10 #include "config.h"

builtin/mv.c

+1

@@ -11,6 +11,7 @@

11 #include "config.h"

12 #include "environment.h"

13 #include "gettext.h"

14 +#include "object-file.h"

15 #include "pathspec.h"

16 #include "lockfile.h"

17 #include "dir.h"

builtin/pack-objects.c

+1

@@ -33,6 +33,7 @@

33 #include "strvec.h"

34 #include "list.h"

35 #include "packfile.h"

36 +#include "object-file.h"

37 #include "object-store.h"

38 #include "replace-object.h"

39 #include "dir.h"

builtin/prune.c

+1

@@ -11,6 +11,7 @@

11 #include "progress.h"

12 #include "prune-packed.h"

13 #include "replace-object.h"

14 +#include "object-file.h"

15 #include "object-name.h"

16 #include "object-store.h"

17 #include "shallow.h"

builtin/rebase.c

+1

@@ -21,6 +21,7 @@

21 #include "cache-tree.h"

22 #include "unpack-trees.h"

23 #include "lockfile.h"

24 +#include "object-file.h"

25 #include "object-name.h"

26 #include "parse-options.h"

27 #include "commit.h"

builtin/replace.c

+1

@@ -17,6 +17,7 @@

17 #include "refs.h"

18 #include "parse-options.h"

19 #include "run-command.h"

20 +#include "object-file.h"

21 #include "object-name.h"

22 #include "object-store.h"

23 #include "replace-object.h"

builtin/rev-list.c

+1

@@ -11,6 +11,7 @@

11 #include "list-objects-filter-options.h"

12 #include "object.h"

13 #include "object-name.h"

14 +#include "object-file.h"

15 #include "object-store.h"

16 #include "pack.h"

17 #include "pack-bitmap.h"

builtin/sparse-checkout.c

+1

@@ -4,6 +4,7 @@

4 #include "dir.h"

5 #include "environment.h"

6 #include "gettext.h"

7 +#include "object-file.h"

8 #include "object-name.h"

9 #include "parse-options.h"

10 #include "pathspec.h"

builtin/submodule--helper.c

+1

@@ -24,6 +24,7 @@

24 #include "revision.h"

25 #include "diffcore.h"

26 #include "diff.h"

27 +#include "object-file.h"

28 #include "object-name.h"

29 #include "object-store.h"

30 #include "advice.h"

builtin/update-index.c

+1

@@ -15,6 +15,7 @@

15 #include "cache-tree.h"

16 #include "tree-walk.h"

17 #include "builtin.h"

18 +#include "object-file.h"

19 #include "refs.h"

20 #include "resolve-undo.h"

21 #include "parse-options.h"

builtin/worktree.c

+1

@@ -7,6 +7,7 @@

7 #include "environment.h"

8 #include "gettext.h"

9 #include "hex.h"

10 +#include "object-file.h"

11 #include "object-name.h"

12 #include "parse-options.h"

13 #include "strvec.h"

bulk-checkin.c

+1

@@ -15,6 +15,7 @@

15 #include "string-list.h"

16 #include "tmp-objdir.h"

17 #include "packfile.h"

18 +#include "object-file.h"

19 #include "object-store.h"

20

21 static int odb_transaction_nesting;

cache-tree.c

+1

@@ -7,6 +7,7 @@

7 #include "tree-walk.h"

8 #include "cache-tree.h"

9 #include "bulk-checkin.h"

10 +#include "object-file.h"

11 #include "object-store.h"

12 #include "replace-object.h"

13 #include "promisor-remote.h"

cache.h

-123

@@ -3,7 +3,6 @@

3

4 #include "git-compat-util.h"

5 #include "strbuf.h"

6 -#include "git-zlib.h"

6 #include "hashmap.h"

7 #include "list.h"

8 #include "gettext.h"

@@ -596,13 +595,6 @@ int has_racy_timestamp(struct index_state *istate);

595 int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);

596 int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);

597

599 -#define HASH_WRITE_OBJECT 1

600 -#define HASH_FORMAT_CHECK 2

601 -#define HASH_RENORMALIZE 4

602 -#define HASH_SILENT 8

603 -int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);

604 -int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);

605 -

598 /*

599 * Record to sd the data from st that we use to check whether a file

600 * might have changed.

@@ -664,107 +656,6 @@ extern int quote_path_fully;

656 #define DATA_CHANGED 0x0020

657 #define TYPE_CHANGED 0x0040

658

667 -/*

668 - * Create the directory containing the named path, using care to be

669 - * somewhat safe against races. Return one of the scld_error values to

670 - * indicate success/failure. On error, set errno to describe the

671 - * problem.

672 - *

673 - * SCLD_VANISHED indicates that one of the ancestor directories of the

674 - * path existed at one point during the function call and then

675 - * suddenly vanished, probably because another process pruned the

676 - * directory while we were working. To be robust against this kind of

677 - * race, callers might want to try invoking the function again when it

678 - * returns SCLD_VANISHED.

679 - *

680 - * safe_create_leading_directories() temporarily changes path while it

681 - * is working but restores it before returning.

682 - * safe_create_leading_directories_const() doesn't modify path, even

683 - * temporarily. Both these variants adjust the permissions of the

684 - * created directories to honor core.sharedRepository, so they are best

685 - * suited for files inside the git dir. For working tree files, use

686 - * safe_create_leading_directories_no_share() instead, as it ignores

687 - * the core.sharedRepository setting.

688 - */

689 -enum scld_error {

690 - SCLD_OK = 0,

691 - SCLD_FAILED = -1,

692 - SCLD_PERMS = -2,

693 - SCLD_EXISTS = -3,

694 - SCLD_VANISHED = -4

695 -};

696 -enum scld_error safe_create_leading_directories(char *path);

697 -enum scld_error safe_create_leading_directories_const(const char *path);

698 -enum scld_error safe_create_leading_directories_no_share(char *path);

699 -

700 -int mkdir_in_gitdir(const char *path);

701 -

702 -int git_open_cloexec(const char *name, int flags);

703 -#define git_open(name) git_open_cloexec(name, O_RDONLY)

704 -

705 -/**

706 - * unpack_loose_header() initializes the data stream needed to unpack

707 - * a loose object header.

708 - *

709 - * Returns:

710 - *

711 - * - ULHR_OK on success

712 - * - ULHR_BAD on error

713 - * - ULHR_TOO_LONG if the header was too long

714 - *

715 - * It will only parse up to MAX_HEADER_LEN bytes unless an optional

716 - * "hdrbuf" argument is non-NULL. This is intended for use with

717 - * OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error)

718 - * reporting. The full header will be extracted to "hdrbuf" for use

719 - * with parse_loose_header(), ULHR_TOO_LONG will still be returned

720 - * from this function to indicate that the header was too long.

721 - */

722 -enum unpack_loose_header_result {

723 - ULHR_OK,

724 - ULHR_BAD,

725 - ULHR_TOO_LONG,

726 -};

727 -enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,

728 - unsigned char *map,

729 - unsigned long mapsize,

730 - void *buffer,

731 - unsigned long bufsiz,

732 - struct strbuf *hdrbuf);

733 -

734 -/**

735 - * parse_loose_header() parses the starting "<type> <len>\0" of an

736 - * object. If it doesn't follow that format -1 is returned. To check

737 - * the validity of the <type> populate the "typep" in the "struct

738 - * object_info". It will be OBJ_BAD if the object type is unknown. The

739 - * parsed <len> can be retrieved via "oi->sizep", and from there

740 - * passed to unpack_loose_rest().

741 - */

742 -struct object_info;

743 -int parse_loose_header(const char *hdr, struct object_info *oi);

744 -

745 -/**

746 - * With in-core object data in "buf", rehash it to make sure the

747 - * object name actually matches "oid" to detect object corruption.

748 - *

749 - * A negative value indicates an error, usually that the OID is not

750 - * what we expected, but it might also indicate another error.

751 - */

752 -int check_object_signature(struct repository *r, const struct object_id *oid,

753 - void *map, unsigned long size,

754 - enum object_type type);

755 -

756 -/**

757 - * A streaming version of check_object_signature().

758 - * Try reading the object named with "oid" using

759 - * the streaming interface and rehash it to do the same.

760 - */

761 -int stream_object_signature(struct repository *r, const struct object_id *oid);

762 -

763 -int finalize_object_file(const char *tmpfile, const char *filename);

764 -

765 -/* Helper to check and "touch" a file */

766 -int check_and_freshen_file(const char *fn, int freshen);

767 -

659 int base_name_compare(const char *name1, size_t len1, int mode1,

660 const char *name2, size_t len2, int mode2);

661 int df_name_compare(const char *name1, size_t len1, int mode1,

@@ -772,12 +663,6 @@ int df_name_compare(const char *name1, size_t len1, int mode1,

663 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);

664 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);

665

775 -void *read_object_with_reference(struct repository *r,

776 - const struct object_id *oid,

777 - enum object_type required_type,

778 - unsigned long *size,

779 - struct object_id *oid_ret);

780 -

666 const char *git_editor(void);

667 const char *git_sequence_editor(void);

668 const char *git_pager(int stdout_is_tty);

@@ -819,14 +704,6 @@ struct pack_entry {

704 struct packed_git *p;

705 };

706

822 -/*

823 - * Set this to 0 to prevent oid_object_info_extended() from fetching missing

824 - * blobs. This has a difference only if extensions.partialClone is set.

825 - *

826 - * Its default value is 1.

827 - */

828 -extern int fetch_if_missing;

829 -

707 /* Dumb servers support */

708 int update_server_info(int);

709

commit-graph.c

+1

@@ -11,6 +11,7 @@

11 #include "revision.h"

12 #include "hash-lookup.h"

13 #include "commit-graph.h"

14 +#include "object-file.h"

15 #include "object-store.h"

16 #include "oid-array.h"

17 #include "alloc.h"

diff.c

+1

@@ -35,6 +35,7 @@

35 #include "help.h"

36 #include "promisor-remote.h"

37 #include "dir.h"

38 +#include "object-file.h"

39 #include "object-name.h"

40 #include "setup.h"

41 #include "strmap.h"

dir.c

+1

@@ -13,6 +13,7 @@

13 #include "dir.h"

14 #include "environment.h"

15 #include "gettext.h"

16 +#include "object-file.h"

17 #include "object-store.h"

18 #include "attr.h"

19 #include "refs.h"

environment.c

+1

@@ -19,6 +19,7 @@

19 #include "fmt-merge-msg.h"

20 #include "commit.h"

21 #include "strvec.h"

22 +#include "object-file.h"

23 #include "object-store.h"

24 #include "replace-object.h"

25 #include "tmp-objdir.h"

http.c

+1

@@ -17,6 +17,7 @@

17 #include "packfile.h"

18 #include "protocol.h"

19 #include "string-list.h"

20 +#include "object-file.h"

21 #include "object-store.h"

22

23 static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);

merge-recursive.c

+1

@@ -22,6 +22,7 @@

22 #include "hex.h"

23 #include "ll-merge.h"

24 #include "lockfile.h"

25 +#include "object-file.h"

26 #include "object-name.h"

27 #include "object-store.h"

28 #include "repository.h"

midx.c

+1

@@ -8,6 +8,7 @@

8 #include "hex.h"

9 #include "lockfile.h"

10 #include "packfile.h"

11 +#include "object-file.h"

12 #include "object-store.h"

13 #include "hash-lookup.h"

14 #include "midx.h"

notes-merge.c

+1

@@ -3,6 +3,7 @@

3 #include "commit.h"

4 #include "gettext.h"

5 #include "refs.h"

6 +#include "object-file.h"

7 #include "object-name.h"

8 #include "object-store.h"

9 #include "repository.h"

object-file.c

+1

@@ -36,6 +36,7 @@

36 #include "mergesort.h"

37 #include "quote.h"

38 #include "packfile.h"

39 +#include "object-file.h"

40 #include "object-store.h"

41 #include "promisor-remote.h"

42 #include "setup.h"

object-file.h new

+129

@@ -0,0 +1,129 @@

1 +#ifndef OBJECT_FILE_H

2 +#define OBJECT_FILE_H

3 +

4 +#include "git-zlib.h"

5 +#include "object.h"

6 +

7 +/*

8 + * Set this to 0 to prevent oid_object_info_extended() from fetching missing

9 + * blobs. This has a difference only if extensions.partialClone is set.

10 + *

11 + * Its default value is 1.

12 + */

13 +extern int fetch_if_missing;

14 +

15 +#define HASH_WRITE_OBJECT 1

16 +#define HASH_FORMAT_CHECK 2

17 +#define HASH_RENORMALIZE 4

18 +#define HASH_SILENT 8

19 +int index_fd(struct index_state *istate, struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);

20 +int index_path(struct index_state *istate, struct object_id *oid, const char *path, struct stat *st, unsigned flags);

21 +

22 +/*

23 + * Create the directory containing the named path, using care to be

24 + * somewhat safe against races. Return one of the scld_error values to

25 + * indicate success/failure. On error, set errno to describe the

26 + * problem.

27 + *

28 + * SCLD_VANISHED indicates that one of the ancestor directories of the

29 + * path existed at one point during the function call and then

30 + * suddenly vanished, probably because another process pruned the

31 + * directory while we were working. To be robust against this kind of

32 + * race, callers might want to try invoking the function again when it

33 + * returns SCLD_VANISHED.

34 + *

35 + * safe_create_leading_directories() temporarily changes path while it

36 + * is working but restores it before returning.

37 + * safe_create_leading_directories_const() doesn't modify path, even

38 + * temporarily. Both these variants adjust the permissions of the

39 + * created directories to honor core.sharedRepository, so they are best

40 + * suited for files inside the git dir. For working tree files, use

41 + * safe_create_leading_directories_no_share() instead, as it ignores

42 + * the core.sharedRepository setting.

43 + */

44 +enum scld_error {

45 + SCLD_OK = 0,

46 + SCLD_FAILED = -1,

47 + SCLD_PERMS = -2,

48 + SCLD_EXISTS = -3,

49 + SCLD_VANISHED = -4

50 +};

51 +enum scld_error safe_create_leading_directories(char *path);

52 +enum scld_error safe_create_leading_directories_const(const char *path);

53 +enum scld_error safe_create_leading_directories_no_share(char *path);

54 +

55 +int mkdir_in_gitdir(const char *path);

56 +

57 +int git_open_cloexec(const char *name, int flags);

58 +#define git_open(name) git_open_cloexec(name, O_RDONLY)

59 +

60 +/**

61 + * unpack_loose_header() initializes the data stream needed to unpack

62 + * a loose object header.

63 + *

64 + * Returns:

65 + *

66 + * - ULHR_OK on success

67 + * - ULHR_BAD on error

68 + * - ULHR_TOO_LONG if the header was too long

69 + *

70 + * It will only parse up to MAX_HEADER_LEN bytes unless an optional

71 + * "hdrbuf" argument is non-NULL. This is intended for use with

72 + * OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error)

73 + * reporting. The full header will be extracted to "hdrbuf" for use

74 + * with parse_loose_header(), ULHR_TOO_LONG will still be returned

75 + * from this function to indicate that the header was too long.

76 + */

77 +enum unpack_loose_header_result {

78 + ULHR_OK,

79 + ULHR_BAD,

80 + ULHR_TOO_LONG,

81 +};

82 +enum unpack_loose_header_result unpack_loose_header(git_zstream *stream,

83 + unsigned char *map,

84 + unsigned long mapsize,

85 + void *buffer,

86 + unsigned long bufsiz,

87 + struct strbuf *hdrbuf);

88 +

89 +/**

90 + * parse_loose_header() parses the starting "<type> <len>\0" of an

91 + * object. If it doesn't follow that format -1 is returned. To check

92 + * the validity of the <type> populate the "typep" in the "struct

93 + * object_info". It will be OBJ_BAD if the object type is unknown. The

94 + * parsed <len> can be retrieved via "oi->sizep", and from there

95 + * passed to unpack_loose_rest().

96 + */

97 +struct object_info;

98 +int parse_loose_header(const char *hdr, struct object_info *oi);

99 +

100 +/**

101 + * With in-core object data in "buf", rehash it to make sure the

102 + * object name actually matches "oid" to detect object corruption.

103 + *

104 + * A negative value indicates an error, usually that the OID is not

105 + * what we expected, but it might also indicate another error.

106 + */

107 +int check_object_signature(struct repository *r, const struct object_id *oid,

108 + void *map, unsigned long size,

109 + enum object_type type);

110 +

111 +/**

112 + * A streaming version of check_object_signature().

113 + * Try reading the object named with "oid" using

114 + * the streaming interface and rehash it to do the same.

115 + */

116 +int stream_object_signature(struct repository *r, const struct object_id *oid);

117 +

118 +int finalize_object_file(const char *tmpfile, const char *filename);

119 +

120 +/* Helper to check and "touch" a file */

121 +int check_and_freshen_file(const char *fn, int freshen);

122 +

123 +void *read_object_with_reference(struct repository *r,

124 + const struct object_id *oid,

125 + enum object_type required_type,

126 + unsigned long *size,

127 + struct object_id *oid_ret);

128 +

129 +#endif /* OBJECT_FILE_H */

object.c

+1

@@ -3,6 +3,7 @@

3 #include "hex.h"

4 #include "object.h"

5 #include "replace-object.h"

6 +#include "object-file.h"

7 #include "object-store.h"

8 #include "blob.h"

9 #include "tree.h"

pack-bitmap.c

+1

@@ -16,6 +16,7 @@

16 #include "packfile.h"

17 #include "repository.h"

18 #include "trace2.h"

19 +#include "object-file.h"

20 #include "object-store.h"

21 #include "list-objects-filter-options.h"

22 #include "midx.h"

pack-check.c

+1

@@ -6,6 +6,7 @@

6 #include "pack-revindex.h"

7 #include "progress.h"

8 #include "packfile.h"

9 +#include "object-file.h"

10 #include "object-store.h"

11

12 struct idx_entry {

pack-mtimes.c

+1

@@ -1,6 +1,7 @@

1 #include "cache.h"

2 #include "gettext.h"

3 #include "pack-mtimes.h"

4 +#include "object-file.h"

5 #include "object-store.h"

6 #include "packfile.h"

7

pack-revindex.c

+1

@@ -1,6 +1,7 @@

1 #include "cache.h"

2 #include "gettext.h"

3 #include "pack-revindex.h"

4 +#include "object-file.h"

5 #include "object-store.h"

6 #include "packfile.h"

7 #include "trace2.h"

packfile.c

+1

@@ -18,6 +18,7 @@

18 #include "trace.h"

19 #include "tree-walk.h"

20 #include "tree.h"

21 +#include "object-file.h"

22 #include "object-store.h"

23 #include "midx.h"

24 #include "commit-graph.h"

read-cache.c

+1

@@ -14,6 +14,7 @@

14 #include "cache-tree.h"

15 #include "refs.h"

16 #include "dir.h"

17 +#include "object-file.h"

18 #include "object-store.h"

19 #include "oid-array.h"

20 #include "tree.h"

refs/files-backend.c

+1

@@ -12,6 +12,7 @@

12 #include "../dir-iterator.h"

13 #include "../lockfile.h"

14 #include "../object.h"

15 +#include "../object-file.h"

16 #include "../dir.h"

17 #include "../chdir-notify.h"

18 #include "../setup.h"

rerere.c

+1

@@ -13,6 +13,7 @@

13 #include "ll-merge.h"

14 #include "attr.h"

15 #include "pathspec.h"

16 +#include "object-file.h"

17 #include "object-store.h"

18 #include "hash-lookup.h"

19 #include "strmap.h"

revision.c

+1

@@ -5,6 +5,7 @@

5 #include "gettext.h"

6 #include "hex.h"

7 #include "object-name.h"

8 +#include "object-file.h"

9 #include "object-store.h"

10 #include "tag.h"

11 #include "blob.h"

sequencer.c

+1

@@ -8,6 +8,7 @@

8 #include "hex.h"

9 #include "lockfile.h"

10 #include "dir.h"

11 +#include "object-file.h"

12 #include "object-name.h"

13 #include "object-store.h"

14 #include "object.h"

server-info.c

+1

@@ -9,6 +9,7 @@

9 #include "commit.h"

10 #include "tag.h"

11 #include "packfile.h"

12 +#include "object-file.h"

13 #include "object-store.h"

14 #include "strbuf.h"

15 #include "wrapper.h"

streaming.c

+1

@@ -6,6 +6,7 @@

6 #include "environment.h"

7 #include "streaming.h"

8 #include "repository.h"

9 +#include "object-file.h"

10 #include "object-store.h"

11 #include "replace-object.h"

12 #include "packfile.h"

submodule.c

+1

@@ -24,6 +24,7 @@

24 #include "remote.h"

25 #include "worktree.h"

26 #include "parse-options.h"

27 +#include "object-file.h"

28 #include "object-name.h"

29 #include "object-store.h"

30 #include "commit-reach.h"

tmp-objdir.c

+1

@@ -4,6 +4,7 @@

4 #include "chdir-notify.h"

5 #include "dir.h"

6 #include "environment.h"

7 +#include "object-file.h"

8 #include "sigchain.h"

9 #include "string-list.h"

10 #include "strbuf.h"

tree-walk.c

+1

@@ -4,6 +4,7 @@

4 #include "dir.h"

5 #include "gettext.h"

6 #include "hex.h"

7 +#include "object-file.h"

8 #include "object-store.h"

9 #include "trace2.h"

10 #include "tree.h"

object-file.h: move declarations for object-file.c functions from cache.h