THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

Merge branch 'rs/sort-oid-array-thread-safe'

Prepare get_short_oid() codepath to be thread-safe.

* rs/sort-oid-array-thread-safe:
  sha1-name: make sort_ambiguous_oid_array() thread-safe
pull/643/head
Junio C Hamano 1 month ago
parent
commit
2743b61bc6
1 changed files with 3 additions and 6 deletions
  1. 3
    6
      sha1-name.c

+ 3
- 6
sha1-name.c View File

@@ -403,9 +403,9 @@ static int repo_collect_ambiguous(struct repository *r,
return collect_ambiguous(oid, data);
}

static struct repository *sort_ambiguous_repo;
static int sort_ambiguous(const void *a, const void *b)
static int sort_ambiguous(const void *a, const void *b, void *ctx)
{
struct repository *sort_ambiguous_repo = ctx;
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;
@@ -434,10 +434,7 @@ static int sort_ambiguous(const void *a, const void *b)

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;
QSORT_S(a->oid, a->nr, sort_ambiguous, r);
}

static enum get_oid_result get_short_oid(struct repository *r,

Loading…
Cancel
Save