diff --git a/config.mak.uname b/config.mak.uname
index d804cb389a7479..406ef1f2f739d0 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -487,7 +487,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
NO_MKDTEMP = YesPlease
NO_MKSTEMPS = YesPlease
NO_SVN_TESTS = YesPlease
- NO_PERL_MAKEMAKER = YesPlease
RUNTIME_PREFIX = YesPlease
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
NO_NSEC = YesPlease
@@ -518,7 +517,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
X = .exe
SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
- htmldir = doc/git/html/
+ htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
prefix =
INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index 17e969df609f71..3982bbf9dbd27d 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -22,7 +22,7 @@ test_expect_success 'run_command can run a command' '
chmod +x hello.sh &&
test-run-command run-command ./hello.sh >actual 2>err &&
- test_cmp hello-script actual &&
+ test_cmp_text hello-script actual &&
test_cmp empty err
'
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index dc30a514bf681d..4d0f3d3c947caf 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -41,19 +41,19 @@ test_expect_success PERL 'custom commands' '
test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" &&
echo master >expect &&
git difftool --no-prompt branch >actual &&
- test_cmp expect actual &&
+ test_cmp_text expect actual &&
test_config difftool.test-tool.cmd "cat \"\$LOCAL\"" &&
echo branch >expect &&
git difftool --no-prompt branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
test_expect_success PERL 'custom tool commands override built-ins' '
test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
echo master >expect &&
git difftool --tool vimdiff --no-prompt branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
test_expect_success PERL 'difftool ignores bad --tool values' '
@@ -84,7 +84,7 @@ test_expect_success PERL 'difftool honors --gui' '
echo branch >expect &&
git difftool --no-prompt --gui branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
test_expect_success PERL 'difftool --gui last setting wins' '
@@ -98,14 +98,14 @@ test_expect_success PERL 'difftool --gui last setting wins' '
test_config diff.guitool test-tool &&
echo branch >expect &&
git difftool --no-prompt --no-gui --gui branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
test_expect_success PERL 'difftool --gui works without configured diff.guitool' '
difftool_test_setup &&
echo branch >expect &&
git difftool --no-prompt --gui branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# Specify the diff tool using $GIT_DIFF_TOOL
@@ -114,7 +114,7 @@ test_expect_success PERL 'GIT_DIFF_TOOL variable' '
git config --unset diff.tool &&
echo branch >expect &&
GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# Test the $GIT_*_TOOL variables and ensure
@@ -126,13 +126,13 @@ test_expect_success PERL 'GIT_DIFF_TOOL overrides' '
echo branch >expect &&
GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual &&
- test_cmp expect actual &&
+ test_cmp_text expect actual &&
test_config diff.tool bogus-tool &&
test_config merge.tool bogus-tool &&
GIT_DIFF_TOOL=bogus-tool \
git difftool --no-prompt --tool=test-tool branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# Test that we don't have to pass --no-prompt to difftool
@@ -141,7 +141,7 @@ test_expect_success PERL 'GIT_DIFFTOOL_NO_PROMPT variable' '
difftool_test_setup &&
echo branch >expect &&
GIT_DIFFTOOL_NO_PROMPT=true git difftool branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# git-difftool supports the difftool.prompt variable.
@@ -161,7 +161,7 @@ test_expect_success PERL 'difftool.prompt config variable is false' '
test_config difftool.prompt false &&
echo branch >expect &&
git difftool branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# Test that we don't have to pass --no-prompt when mergetool.prompt is false
@@ -171,7 +171,7 @@ test_expect_success PERL 'difftool merge.prompt = false' '
test_config mergetool.prompt false &&
echo branch >expect &&
git difftool branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# Test that the -y flag can override difftool.prompt = true
@@ -180,7 +180,7 @@ test_expect_success PERL 'difftool.prompt can overridden with -y' '
test_config difftool.prompt true &&
echo branch >expect &&
git difftool -y branch >actual &&
- test_cmp expect actual
+ test_cmp_text expect actual
'
# Test that the --prompt flag can override difftool.prompt = false
@@ -198,7 +198,7 @@ test_expect_success PERL 'difftool last flag wins' '
difftool_test_setup &&
echo branch >expect &&
git difftool --prompt --no-prompt branch >actual &&
- test_cmp expect actual &&
+ test_cmp_text expect actual &&
echo >input &&
git difftool --no-prompt --prompt branch output &&
prompt=$(tail -1