undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packfile: allow find_pack_entry to handle arbitrary repositories

Browse Source 
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>
This commit is contained in:
Stefan Beller 2018-03-23 18:45:26 +01:00 committed by Junio C Hamano
parent 613b42f283
commit 0a0dd632aa
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packfile.c
View File

@ -1845,19 +1845,18 @@ static int fill_pack_entry(const unsigned char *sha1,
return 1; 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; struct list_head *pos;
prepare_packed_git(the_repository); prepare_packed_git(r);
if (!the_repository->objects->packed_git) if (!r->objects->packed_git)
return 0; 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); struct packed_git *p = list_entry(pos, struct packed_git, mru);
if (fill_pack_entry(sha1, e, p)) { if (fill_pack_entry(sha1, e, p)) {
list_move(&p->mru, list_move(&p->mru, &r->objects->packed_git_mru);
&the_repository->objects->packed_git_mru);
return 1; return 1;
} }
} }

3
packfile.h
View File

@ -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, * Iff a pack file in the given repository contains the object named by sha1,
* return true and store its location to e. * 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(struct repository *r, const unsigned char *sha1, struct pack_entry *e);
extern int find_pack_entry_the_repository(const unsigned char *sha1, struct pack_entry *e);
extern int has_sha1_pack(const unsigned char *sha1); extern int has_sha1_pack(const unsigned char *sha1);