From a88183f168660bb784baad536e44239a1f3dffb8 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Fri, 22 Jan 2010 22:03:36 -0800 Subject: [PATCH] t7800-difftool.sh: Test mergetool.prompt fallback 4cacc621 made difftool fall back to mergetool.prompt when difftool.prompt is unconfigured. This adds a test. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- t/t7800-difftool.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index fad5472257..19c72f55bf 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -27,6 +27,7 @@ remove_config_vars() git config --unset difftool.prompt git config --unset merge.tool git config --unset mergetool.test-tool.cmd + git config --unset mergetool.prompt return 0 } @@ -159,6 +160,17 @@ test_expect_success 'difftool.prompt config variable is false' ' restore_test_defaults ' +# Test that we don't have to pass --no-prompt when mergetool.prompt is false +test_expect_success 'difftool merge.prompt = false' ' + git config --unset difftool.prompt + git config mergetool.prompt false && + + diff=$(git difftool branch) && + test "$diff" = "branch" && + + restore_test_defaults +' + # Test that the -y flag can override difftool.prompt = true test_expect_success 'difftool.prompt can overridden with -y' ' git config difftool.prompt true && -- 2.11.4.GIT