Browse Source

sha1-name.c: remove the_repo from find_abbrev_len_packed()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 6 years ago committed by Junio C Hamano
parent
commit
7f07c033a6
  1. 6
      sha1-name.c

6
sha1-name.c

@ -514,6 +514,7 @@ struct min_abbrev_data { @@ -514,6 +514,7 @@ struct min_abbrev_data {
unsigned int init_len;
unsigned int cur_len;
char *hex;
struct repository *repo;
const struct object_id *oid;
};

@ -619,9 +620,9 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad) @@ -619,9 +620,9 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
struct multi_pack_index *m;
struct packed_git *p;

for (m = get_multi_pack_index(the_repository); m; m = m->next)
for (m = get_multi_pack_index(mad->repo); m; m = m->next)
find_abbrev_len_for_midx(m, mad);
for (p = get_packed_git(the_repository); p; p = p->next)
for (p = get_packed_git(mad->repo); p; p = p->next)
find_abbrev_len_for_pack(p, mad);
}

@ -658,6 +659,7 @@ int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len) @@ -658,6 +659,7 @@ int find_unique_abbrev_r(char *hex, const struct object_id *oid, int len)
if (len == hexsz || !len)
return hexsz;

mad.repo = the_repository;
mad.init_len = len;
mad.cur_len = len;
mad.hex = hex;

Loading…
Cancel
Save