X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft7800-difftool.sh;h=1de83ef98fdcbfd63469e66ba4886c2477b983ff;hb=f9bdf9b2102bd848c7a3eabff2ba5af63828de54;hp=19c72f55bf60c746f72e640e24043b2d83e00fe3;hpb=cc8eb6407e88a46da6d41e18cffed3878f2c53cf;p=git.git

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 19c72f55b..1de83ef98 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -92,6 +92,15 @@ test_expect_success 'difftool honors --gui' '
 	restore_test_defaults
 '
 
+test_expect_success 'difftool --gui works without configured diff.guitool' '
+	git config diff.tool test-tool &&
+
+	diff=$(git difftool --no-prompt --gui branch) &&
+	test "$diff" = "branch" &&
+
+	restore_test_defaults
+'
+
 # Specify the diff tool using $GIT_DIFF_TOOL
 test_expect_success 'GIT_DIFF_TOOL variable' '
 	git config --unset diff.tool