From 36ed69a0abbfcec4c6dffd98f4a22743490c7fe7 Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Tue, 17 Feb 2026 22:24:56 +0100 Subject: [PATCH] Restore the availability of 'iconv' executable Since Git for Windows v2.53, 'iconv.exe' is missing from the distribution. It's not a core dependency but it was there since the very first times, mentioned in https://git-scm.com/docs/gitattributes/2.50.0#_working_tree_encoding to support the proper usage of the 'working-tree-encoding' attribute. Fixes git-for-windows/git#6083 Signed-off-by: Matteo Scaramuccia --- make-file-list.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-file-list.sh b/make-file-list.sh index 9386ea6f9d..a774854936 100755 --- a/make-file-list.sh +++ b/make-file-list.sh @@ -33,7 +33,7 @@ UTIL_PACKAGES="sed awk grep findutils coreutils" if test -n "$MINIMAL_GIT_WITH_BUSYBOX" then PACKAGE_EXCLUDES="$PACKAGE_EXCLUDES bash sh coreutils mingw-w64-busybox - libiconv libintl libreadline ncurses openssl + libiconv iconv libintl libreadline ncurses openssl mingw-w64-libmetalink mingw-w64-spdylay diffutils" EXTRA_FILE_EXCLUDES="/etc/post-install/.* /usr/bin/getfacl.exe @@ -188,7 +188,7 @@ mingw-w64-$PACMAN_ARCH-git-extra openssh $UTIL_PACKAGES $LIBCURL_EXTRA" if test -z "$MINIMAL_GIT" then packages="$packages mingw-w64-$PACMAN_ARCH-git-doc-html ncurses mintty vim nano - winpty less gnupg tar diffutils patch dos2unix which subversion perl-JSON + winpty less gnupg tar diffutils iconv patch dos2unix which subversion perl-JSON mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect docx2txt mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt ssh-pageant mingw-w64-$PACMAN_ARCH-git-lfs mingw-w64-$PACMAN_ARCH-xz tig $GIT_UPDATE_EXTRA_PACKAGES"