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 <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Jan 22, 2010 at 22:03 UTC
a88183f168660bb784baad536e44239a1f3dffb8
1 file changed
+12
t/t7800-difftool.sh
+12
@@ -27,6 +27,7 @@ remove_config_vars()
27
git config --unset difftool.prompt
28
git config --unset merge.tool
29
git config --unset mergetool.test-tool.cmd
30
+ git config --unset mergetool.prompt
31
return 0
32
}
33
@@ -159,6 +160,17 @@ test_expect_success 'difftool.prompt config variable is false' '
160
restore_test_defaults
161
'
162
163
+# Test that we don't have to pass --no-prompt when mergetool.prompt is false
164
+test_expect_success 'difftool merge.prompt = false' '
165
+ git config --unset difftool.prompt
166
+ git config mergetool.prompt false &&
167
+
168
+ diff=$(git difftool branch) &&
169
+ test "$diff" = "branch" &&
170
+
171
+ restore_test_defaults
172
+'
173
+
174
# Test that the -y flag can override difftool.prompt = true
175
test_expect_success 'difftool.prompt can overridden with -y' '
176
git config difftool.prompt true &&