From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Feb 2026 23:11:52 +0000 (-0800)
Subject: Merge branch 'ps/tests-wo-iconv-fixes'
X-Git-Tag: v2.54.0-rc0~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac78c5804e080aa8f0307155eda85465a2a1b1dd;p=thirdparty%2Fgit.git

Merge branch 'ps/tests-wo-iconv-fixes'

Some tests assumed "iconv" is available without honoring ICONV
prerequisite, which has been corrected.

* ps/tests-wo-iconv-fixes:
  t6006: don't use iconv(1) without ICONV prereq
  t5550: add ICONV prereq to tests that use "$HTTPD_URL/error"
  t4205: improve handling of ICONV prerequisite
  t40xx: don't use iconv(1) without ICONV prereq
  t: don't set ICONV prereq when iconv(1) is missing
---

ac78c5804e080aa8f0307155eda85465a2a1b1dd