Skip to content

Commit 4cf0647

Browse files
committed
fixup! mingw: allow git.exe to be used instead of the "Git wrapper"
Let's make the `.dll` copying a bit more robust. At least in my hands, the check sometimes failed to detect whether there are any `.dll` files to be copied. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4c5c47d commit 4cf0647

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

t/t0060-path-utils.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,13 +630,11 @@ test_expect_success MINGW,RUNTIME_PREFIX 'MSYSTEM/PATH is adjusted if necessary'
630630
cp "$GIT_EXEC_PATH"/git.exe pretend"$MINGW_PREFIX"/bin/ &&
631631
cp "$GIT_EXEC_PATH"/git.exe pretend"$MINGW_PREFIX"/libexec/git-core/ &&
632632
# copy the .dll files, if any (happens when building via CMake)
633-
case "$GIT_EXEC_PATH"/*.dll in
634-
*/"*.dll") ;; # no `.dll` files to be copied
635-
*)
633+
if test -n "$(ls "$GIT_EXEC_PATH"/*.dll 2>/dev/null)"
634+
then
636635
cp "$GIT_EXEC_PATH"/*.dll pretend"$MINGW_PREFIX"/bin/ &&
637636
cp "$GIT_EXEC_PATH"/*.dll pretend"$MINGW_PREFIX"/libexec/git-core/
638-
;;
639-
esac &&
637+
fi &&
640638
echo "env | grep MSYSTEM=" | write_script "$HOME"/bin/git-test-home &&
641639
echo "echo ${MINGW_PREFIX#/}" | write_script pretend"$MINGW_PREFIX"/bin/git-test-bin &&
642640
echo "echo usr" | write_script pretend/usr/bin/git-test-bin2 &&

0 commit comments

Comments
 (0)