From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 Nov 2024 22:57:05 +0000 (+0900)
Subject: Merge branch 'bc/c23'
X-Git-Tag: v2.48.0-rc0~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93905d3b704e89e8381e174b111c67b5cdf8246d;p=thirdparty%2Fgit.git

Merge branch 'bc/c23'

C23 compatibility updates.

* bc/c23:
  reflog: rename unreachable
  index-pack: rename struct thread_local
---

93905d3b704e89e8381e174b111c67b5cdf8246d
diff --cc builtin/index-pack.c
index 08b340552f,74675dbd6c..d8f9360222
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -154,14 -148,7 +154,14 @@@ static uint32_t input_crc32
  static int input_fd, output_fd;
  static const char *curr_pack;
  
 +/*
 + * local_links is guarded by read_mutex, and record_local_links is read-only in
 + * a thread.
 + */
 +static struct oidset local_links = OIDSET_INIT;
 +static int record_local_links;
 +
- static struct thread_local *thread_data;
+ static struct thread_local_data *thread_data;
  static int nr_dispatched;
  static int threads_active;