kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 2019-04-16 16:33:21 +07:00 committed by Junio C Hamano
parent fae2ae45df
commit 7f07c033a6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sha1-name.c
View File

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


@ -619,9 +620,9 @@ static void find_abbrev_len_packed(struct min_abbrev_data *mad)
struct multi_pack_index *m; struct multi_pack_index *m;
struct packed_git *p; 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); 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); 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)
if (len == hexsz || !len) if (len == hexsz || !len)
return hexsz; return hexsz;


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