diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 07:09:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 07:09:55 +0300 |
| commit | 3a1ec60c43b1cad73fed8040aed7117900e9fd9d (patch) | |
| tree | 596ad53743761ff1ea09a80cf3f154aafa615f08 /sha1_file.c | |
| parent | cf0b1793ead9428d88e6592e624c7cb222913c58 (diff) | |
| parent | 464416a2eaadf84d2bfdf795007863d03b222b7c (diff) | |
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 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sha1_file.c b/sha1_file.c index aab3b58e03..77ccaab928 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1268,7 +1268,7 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi } while (1) { - if (find_pack_entry(real->hash, &e)) + if (find_pack_entry(the_repository, real->hash, &e)) break; if (flags & OBJECT_INFO_IGNORE_LOOSE) @@ -1280,8 +1280,8 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi /* Not a loose object; someone else may have just packed it. */ if (!(flags & OBJECT_INFO_QUICK)) { - reprepare_packed_git(); - if (find_pack_entry(real->hash, &e)) + reprepare_packed_git(the_repository); + if (find_pack_entry(the_repository, real->hash, &e)) break; } @@ -1669,7 +1669,7 @@ static int freshen_loose_object(const unsigned char *sha1) static int freshen_packed_object(const unsigned char *sha1) { struct pack_entry e; - if (!find_pack_entry(sha1, &e)) + if (!find_pack_entry(the_repository, sha1, &e)) return 0; if (e.p->freshened) return 1; |