@matheusbsbs / matheus-bagliano / commits / 9ce639c76f

t40xx: don't use iconv(1) without ICONV prereq

We've got a couple of tests related to diffs in t40xx that use the iconv(1) executable to convert the encoding of a commit message. All of these tests are prepared to handle a missing ICONV prereq, in which case they will simply use UTF-8 encoding. But even if the ICONV prerequisite has failed we try to use the iconv(1) executable, even though it's not safe to assume that the executable exists in that case. And besides that, it's also unnecessary to use iconv(1) in the first place, as we would only use it to convert from UTF-8 to UTF-8, which should be equivalent to a no-op. Fix the issue and skip the call to iconv(1) in case the prerequisite is not set. This makes tests work on systems that don't have iconv at all. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Feb 20, 2026 at 09:26 UTC 9ce639c76f567c401c37bc10322ca7ddc7129681
3 files changed +18 -6
t/t4041-diff-submodule-option.sh
+6 -2
@@ -37,8 +37,12 @@ add_file () {
37 test_tick &&
38 # "git commit -m" would break MinGW, as Windows refuse to pass
39 # $test_encoding encoded parameter to git.
40 - echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding |
41 - git -c "i18n.commitEncoding=$test_encoding" commit -F -
40 + message="Add $name ($added $name)" &&
41 + if test_have_prereq ICONV
42 + then
43 + message=$(echo "$message" | iconv -f utf-8 -t $test_encoding)
44 + fi &&
45 + echo "$message" | git -c "i18n.commitEncoding=$test_encoding" commit -F -
46 done >/dev/null &&
47 git rev-parse --short --verify HEAD
48 )
t/t4059-diff-submodule-not-initialized.sh
+6 -2
@@ -35,8 +35,12 @@ add_file () {
35 test_tick &&
36 # "git commit -m" would break MinGW, as Windows refuse to pass
37 # $test_encoding encoded parameter to git.
38 - echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding |
39 - git -c "i18n.commitEncoding=$test_encoding" commit -F -
38 + message="Add $name ($added $name)" &&
39 + if test_have_prereq ICONV
40 + then
41 + message=$(echo "$message" | iconv -f utf-8 -t $test_encoding)
42 + fi &&
43 + echo "$message" | git -c "i18n.commitEncoding=$test_encoding" commit -F -
44 done >/dev/null &&
45 git rev-parse --short --verify HEAD
46 )
t/t4060-diff-submodule-option-diff-format.sh
+6 -2
@@ -35,8 +35,12 @@ add_file () {
35 test_tick &&
36 # "git commit -m" would break MinGW, as Windows refuse to pass
37 # $test_encoding encoded parameter to git.
38 - echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding |
39 - git -c "i18n.commitEncoding=$test_encoding" commit -F -
38 + message="Add $name ($added $name)" &&
39 + if test_have_prereq ICONV
40 + then
41 + message=$(echo "$message" | iconv -f utf-8 -t $test_encoding)
42 + fi &&
43 + echo "$message" | git -c "i18n.commitEncoding=$test_encoding" commit -F -
44 done >/dev/null &&
45 git rev-parse --short --verify HEAD
46 )