t7800 (difftool): add missing &&
Also remove a call to 'git config --unset difftool.prompt', since that is already unset by restore_test_defaults. Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Oct 3, 2010 at 14:00 UTC
bc0f35ca238ff88829cd9839641a316e859348a2
1 file changed
+6
-6
t/t7800-difftool.sh
+6
-6
@@ -98,7 +98,7 @@ test_expect_success PERL 'difftool --gui works without configured diff.guitool'
98
99
# Specify the diff tool using $GIT_DIFF_TOOL
100
test_expect_success PERL 'GIT_DIFF_TOOL variable' '
101
- git config --unset diff.tool
101
+ test_might_fail git config --unset diff.tool &&
102
GIT_DIFF_TOOL=test-tool &&
103
export GIT_DIFF_TOOL &&
104
@@ -166,7 +166,7 @@ test_expect_success PERL 'difftool.prompt config variable is false' '
166
167
# Test that we don't have to pass --no-prompt when mergetool.prompt is false
168
test_expect_success PERL 'difftool merge.prompt = false' '
169
- git config --unset difftool.prompt
169
+ test_might_fail git config --unset difftool.prompt &&
170
git config mergetool.prompt false &&
171
172
diff=$(git difftool branch) &&
@@ -211,7 +211,7 @@ test_expect_success PERL 'difftool last flag wins' '
211
# git-difftool falls back to git-mergetool config variables
212
# so test that behavior here
213
test_expect_success PERL 'difftool + mergetool config variables' '
214
- remove_config_vars
214
+ remove_config_vars &&
215
git config merge.tool test-tool &&
216
git config mergetool.test-tool.cmd "cat \$LOCAL" &&
217
@@ -254,17 +254,17 @@ test_expect_success PERL 'difftool -x cat' '
254
'
255
256
test_expect_success PERL 'difftool --extcmd echo arg1' '
257
- diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch)
257
+ diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch) &&
258
test "$diff" = file
259
'
260
261
test_expect_success PERL 'difftool --extcmd cat arg1' '
262
- diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch)
262
+ diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch) &&
263
test "$diff" = master
264
'
265
266
test_expect_success PERL 'difftool --extcmd cat arg2' '
267
- diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch)
267
+ diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch) &&
268
test "$diff" = branch
269
'
270