summaryrefslogtreecommitdiff
path: root/sha1-name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-19 07:45:30 (GMT)
commit454b419729142cd65466cabdb253d06c3699d098 (patch)
tree38647bbf5a1e1cd3600606596971559ac16bb063 /sha1-name.c
parent97616ca488ba460e20cbbb3374aabc97919b44ca (diff)
parentaf96fe3392fb078cb5447bcb94f2ed8d79d0a4a8 (diff)
downloadgit-454b419729142cd65466cabdb253d06c3699d098.zip
git-454b419729142cd65466cabdb253d06c3699d098.tar.gz
git-454b419729142cd65466cabdb253d06c3699d098.tar.bz2
Merge branch 'ds/midx-too-many-packs'
The code to generate the multi-pack idx file was not prepared to see too many packfiles and ran out of open file descriptor, which has been corrected. * ds/midx-too-many-packs: midx: add packs to packed_git linked list midx: pass a repository pointer
Diffstat (limited to 'sha1-name.c')
-rw-r--r--sha1-name.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sha1-name.c b/sha1-name.c
index 775a73d..b4f5cad 100644
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -157,6 +157,9 @@ static void unique_in_pack(struct packed_git *p,
uint32_t num, i, first = 0;
const struct object_id *current = NULL;
+ if (p->multi_pack_index)
+ return;
+
if (open_pack_index(p) || !p->num_objects)
return;
@@ -625,6 +628,9 @@ static void find_abbrev_len_for_pack(struct packed_git *p,
struct object_id oid;
const struct object_id *mad_oid;
+ if (p->multi_pack_index)
+ return;
+
if (open_pack_index(p) || !p->num_objects)
return;