development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 06:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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:
Nguyễn Thái Ngọc Duy 2019-04-16 16:33:20 +07:00 committed by Junio C Hamano
parent 301b8c7f40
commit fae2ae45df
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sha1-name.c
View file

@ -383,10 +383,11 @@ static int collect_ambiguous(const struct object_id *oid, void *data)
return 0;
}
static struct repository *sort_ambiguous_repo;
static int sort_ambiguous(const void *a, const void *b)
{
int a_type = oid_object_info(the_repository, a, NULL);
int b_type = oid_object_info(the_repository, b, NULL);
int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
int a_type_sort;
int b_type_sort;
@ -411,6 +412,14 @@ static int sort_ambiguous(const void *a, const void *b)
return a_type_sort > b_type_sort ? 1 : -1;
}
static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
{
/* mutex will be needed if this code is to be made thread safe */
sort_ambiguous_repo = r;
QSORT(a->oid, a->nr, sort_ambiguous);
sort_ambiguous_repo = NULL;
}
static enum get_oid_result get_short_oid(const char *name, int len,
struct object_id *oid,
unsigned flags)
@ -458,7 +467,7 @@ static enum get_oid_result get_short_oid(const char *name, int len,
advise(_("The candidates are:"));
for_each_abbrev(ds.hex_pfx, collect_ambiguous, &collect);
QSORT(collect.oid, collect.nr, sort_ambiguous);
sort_ambiguous_oid_array(the_repository, &collect);
if (oid_array_for_each(&collect, show_ambiguous_object, &ds))
BUG("show_ambiguous_object shouldn't return non-zero");