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

packfile: skip loading index if in multi-pack-index

Browse Source 
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2018-07-12 15:39:39 -04:00 committed by Junio C Hamano
parent f3a002bd84
commit 17c35c8969
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packfile.c
View File

@ -469,8 +469,19 @@ static int open_packed_git_1(struct packed_git *p)
ssize_t read_result; ssize_t read_result;
const unsigned hashsz = the_hash_algo->rawsz; const unsigned hashsz = the_hash_algo->rawsz;
if (!p->index_data && open_pack_index(p)) if (!p->index_data) {
return error("packfile %s index unavailable", p->pack_name); struct multi_pack_index *m;
const char *pack_name = strrchr(p->pack_name, '/');
for (m = the_repository->objects->multi_pack_index;
m; m = m->next) {
if (midx_contains_pack(m, pack_name))
break;
}
if (!m && open_pack_index(p))
return error("packfile %s index unavailable", p->pack_name);
}
if (!pack_max_fds) { if (!pack_max_fds) {
unsigned int max_fds = get_max_fd_limit(); unsigned int max_fds = get_max_fd_limit();
@ -521,6 +532,10 @@ static int open_packed_git_1(struct packed_git *p)
" supported (try upgrading GIT to a newer version)", " supported (try upgrading GIT to a newer version)",
p->pack_name, ntohl(hdr.hdr_version)); p->pack_name, ntohl(hdr.hdr_version));
/* Skip index checking if in multi-pack-index */
if (!p->index_data)
return 0;
/* Verify the pack matches its index. */ /* Verify the pack matches its index. */
if (p->num_objects != ntohl(hdr.hdr_entries)) if (p->num_objects != ntohl(hdr.hdr_entries))
return error("packfile %s claims to have %"PRIu32" objects" return error("packfile %s claims to have %"PRIu32" objects"