aboutsummaryrefslogtreecommitdiff
path: root/t/t4059-diff-submodule-not-initialized.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t4059-diff-submodule-not-initialized.sh')
-rwxr-xr-xt/t4059-diff-submodule-not-initialized.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t4059-diff-submodule-not-initialized.sh b/t/t4059-diff-submodule-not-initialized.sh
index 0fe81056d5..bb902ce94d 100755
--- a/t/t4059-diff-submodule-not-initialized.sh
+++ b/t/t4059-diff-submodule-not-initialized.sh
@@ -35,8 +35,12 @@ add_file () {
test_tick &&
# "git commit -m" would break MinGW, as Windows refuse to pass
# $test_encoding encoded parameter to git.
- echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding |
- git -c "i18n.commitEncoding=$test_encoding" commit -F -
+ message="Add $name ($added $name)" &&
+ if test_have_prereq ICONV
+ then
+ message=$(echo "$message" | iconv -f utf-8 -t $test_encoding)
+ fi &&
+ echo "$message" | git -c "i18n.commitEncoding=$test_encoding" commit -F -
done >/dev/null &&
git rev-parse --short --verify HEAD
)