Merge branch 'js/diff-verbose-submodule'

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 2586f864a0df4d8c6fb2c7ca0824a6d53ce0520d..fff6a6d0eab4b27d5bc7ff4636913cb10296ab7b 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -10,6 +10,11 @@ Testing basic diff tool invocation
 
 . ./test-lib.sh
 
+if ! test_have_prereq PERL; then
+       say 'skipping difftool tests, perl not available'
+       test_done
+fi
+
 remove_config_vars()
 {
        # Unset all config variables used by git-difftool
@@ -131,7 +136,7 @@ test_expect_success 'GIT_DIFFTOOL_PROMPT variable' '
        GIT_DIFFTOOL_PROMPT=true &&
        export GIT_DIFFTOOL_PROMPT &&
 
-       prompt=$(echo | git difftool --prompt branch | tail -1) &&
+       prompt=$(echo | git difftool branch | tail -1) &&
        prompt_given "$prompt" &&
 
        restore_test_defaults