From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Mar 2026 17:56:04 +0000 (-0700)
Subject: Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation'
X-Git-Tag: v2.54.0-rc0~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdfa7f64d641fe21661087d7bdb0f58d66e3d2de;p=thirdparty%2Fgit.git

Merge branch 'ps/ci-gitlab-prepare-for-macos-14-deprecation'

Move gitlab CI from macOS 14 images that are being deprecated.

* ps/ci-gitlab-prepare-for-macos-14-deprecation:
  gitlab-ci: update to macOS 15 images
  meson: detect broken iconv that requires ICONV_RESTART_RESET
  meson: simplify iconv-emits-BOM check
---

fdfa7f64d641fe21661087d7bdb0f58d66e3d2de