Skip to content

Commit bbe37ee

Browse files
authored
make-file-list: exclude vim and nano from MinGit (#686)
The recent change in 304b5f8 (please.sh build-mingw-w64-git: configure the editor explicitly, 2026-03-24) sets `_DEFAULT_EDITOR=vim` when building the `mingw-w64-git` package. The MINGW-packages PKGBUILD uses this variable for two purposes: configuring Git's default editor at build time, and adding the corresponding package as a hard dependency. As a consequence, `pactree` now resolves `vim` as a transitive dependency of `mingw-w64-x86_64-git`. The `vim` package contributes 2,312 files (mostly syntax highlighting under `usr/share/vim/`), adding roughly 93 KB to the argument string that `release.sh` passes to `7z` on line 176. The total command line reaches about 104 KB, far exceeding the ~32 KB `ARG_MAX` limit on MSYS2, and `7z` fails with \"Argument list too long\", as seen in https://github.com/git-for-windows/git-sdk-64/actions/runs/23514237228/job/68444863860. MinGit is intentionally minimal and has no use for an interactive editor. This excludes both `vim` and `nano` (the MSYS2 default editor) from the `MINIMAL_GIT` package set so that neither can inflate the file list, regardless of which `_DEFAULT_EDITOR` value is configured.
2 parents 7140085 + 7efb01d commit bbe37ee

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

make-file-list.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ then
5151
mingw-w64-libsystre mingw-w64-libtre-git mingw-w64-p11-kit
5252
mingw-w64-tcl mingw-w64-tk mingw-w64-wineditline gdbm icu libdb
5353
libedit libgdbm perl perl-.* mingw-w64-tzdata
54-
mingw-w64-git-svn subversion libserf apr apr-util expat libexpat liblz4"
54+
mingw-w64-git-svn subversion libserf apr apr-util expat libexpat liblz4
55+
vim nano"
5556
fi
5657
if test -z "$INCLUDE_GIT_UPDATE"
5758
then
@@ -184,14 +185,15 @@ G4W_PACKAGE=mingw-w64-$PACMAN_ARCH-git-for-windows-addons ||
184185
G4W_PACKAGE=mingw-w64-$PACMAN_ARCH-git
185186

186187
packages="$G4W_PACKAGE mingw-w64-$PACMAN_ARCH-git-credential-manager
187-
mingw-w64-$PACMAN_ARCH-git-extra openssh $UTIL_PACKAGES $LIBCURL_EXTRA"
188+
mingw-w64-$PACMAN_ARCH-git-extra openssh msys2-runtime $UTIL_PACKAGES $LIBCURL_EXTRA"
188189
if test -z "$MINIMAL_GIT"
189190
then
190191
packages="$packages mingw-w64-$PACMAN_ARCH-git-doc-html ncurses mintty vim nano
191-
winpty less gnupg tar diffutils iconv patch dos2unix which subversion perl-JSON
192+
winpty less gnupg tar diffutils patch dos2unix which subversion perl-JSON
192193
mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect docx2txt
193194
mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt ssh-pageant
194195
mingw-w64-$PACMAN_ARCH-git-lfs mingw-w64-$PACMAN_ARCH-xz tig $GIT_UPDATE_EXTRA_PACKAGES"
196+
test i686 = "$ARCH" || packages="$packages iconv"
195197
fi
196198

197199
I686_EXCLUDE=

0 commit comments

Comments
 (0)