summaryrefslogtreecommitdiff
path: root/packfile.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 04:09:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 04:09:55 (GMT)
commit3a1ec60c43b1cad73fed8040aed7117900e9fd9d (patch)
tree596ad53743761ff1ea09a80cf3f154aafa615f08 /packfile.h
parentcf0b1793ead9428d88e6592e624c7cb222913c58 (diff)
parent464416a2eaadf84d2bfdf795007863d03b222b7c (diff)
downloadgit-3a1ec60c43b1cad73fed8040aed7117900e9fd9d.zip
git-3a1ec60c43b1cad73fed8040aed7117900e9fd9d.tar.gz
git-3a1ec60c43b1cad73fed8040aed7117900e9fd9d.tar.bz2
Merge branch 'sb/packfiles-in-repository'
Refactoring of the internal global data structure continues. * sb/packfiles-in-repository: packfile: keep prepare_packed_git() private packfile: allow find_pack_entry to handle arbitrary repositories packfile: add repository argument to find_pack_entry packfile: allow reprepare_packed_git to handle arbitrary repositories packfile: allow prepare_packed_git to handle arbitrary repositories packfile: allow prepare_packed_git_one to handle arbitrary repositories packfile: add repository argument to reprepare_packed_git packfile: add repository argument to prepare_packed_git packfile: add repository argument to prepare_packed_git_one packfile: allow install_packed_git to handle arbitrary repositories packfile: allow rearrange_packed_git to handle arbitrary repositories packfile: allow prepare_packed_git_mru to handle arbitrary repositories
Diffstat (limited to 'packfile.h')
-rw-r--r--packfile.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/packfile.h b/packfile.h
index a7abd60..a92c0b2 100644
--- a/packfile.h
+++ b/packfile.h
@@ -34,9 +34,8 @@ extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_
#define PACKDIR_FILE_GARBAGE 4
extern void (*report_garbage)(unsigned seen_bits, const char *path);
-extern void prepare_packed_git(void);
-extern void reprepare_packed_git(void);
-extern void install_packed_git(struct packed_git *pack);
+extern void reprepare_packed_git(struct repository *r);
+extern void install_packed_git(struct repository *r, struct packed_git *pack);
struct packed_git *get_packed_git(struct repository *r);
struct list_head *get_packed_git_mru(struct repository *r);
@@ -131,7 +130,11 @@ extern int packed_object_info(struct packed_git *pack, off_t offset, struct obje
extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
-extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);
+/*
+ * Iff a pack file in the given repository contains the object named by sha1,
+ * return true and store its location to e.
+ */
+extern int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack_entry *e);
extern int has_sha1_pack(const unsigned char *sha1);