diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-03-23 18:45:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-26 10:07:43 -0700 |
| commit | 0a0dd632aa9c9bcdb1b79a7fc4cf6dc161760020 (patch) | |
| tree | 7e6d7440bead5d3e027543a74ed78745234824c9 | |
| parent | packfile: add repository argument to find_pack_entry (diff) | |
| download | tgif-0a0dd632aa9c9bcdb1b79a7fc4cf6dc161760020.tar.xz | |
packfile: allow find_pack_entry to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | packfile.c | 11 | ||||
| -rw-r--r-- | packfile.h | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/packfile.c b/packfile.c index 9df123f0f1..5d4c8d6e57 100644 --- a/packfile.c +++ b/packfile.c @@ -1845,19 +1845,18 @@ static int fill_pack_entry(const unsigned char *sha1, return 1; } -int find_pack_entry_the_repository(const unsigned char *sha1, struct pack_entry *e) +int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack_entry *e) { struct list_head *pos; - prepare_packed_git(the_repository); - if (!the_repository->objects->packed_git) + prepare_packed_git(r); + if (!r->objects->packed_git) return 0; - list_for_each(pos, &the_repository->objects->packed_git_mru) { + list_for_each(pos, &r->objects->packed_git_mru) { struct packed_git *p = list_entry(pos, struct packed_git, mru); if (fill_pack_entry(sha1, e, p)) { - list_move(&p->mru, - &the_repository->objects->packed_git_mru); + list_move(&p->mru, &r->objects->packed_git_mru); return 1; } } diff --git a/packfile.h b/packfile.h index e68f790ea7..fe1a6380e6 100644 --- a/packfile.h +++ b/packfile.h @@ -127,8 +127,7 @@ extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1); * Iff a pack file in the given repository contains the object named by sha1, * return true and store its location to e. */ -#define find_pack_entry(r, s, e) find_pack_entry_##r(s, e) -extern int find_pack_entry_the_repository(const unsigned char *sha1, struct pack_entry *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); |