summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-11-18 10:16:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-18 10:16:55 -0800
commit3f78278beb9792368de7edbbb031c3a88e0038a1 (patch)
tree42d7a2d7309fffd683ddd62b507ae1d65bea1a64 /t
parentMerge branch 'master' of git://github.com/git-l10n/git-po (diff)
parentdifftool: honor --trust-exit-code for builtin tools (diff)
downloadtgif-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.xz
Merge branch 'da/difftool'
Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools
Diffstat (limited to 't')
-rwxr-xr-xt/t7800-difftool.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 69bde7aa28..ea35a0241c 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -86,6 +86,11 @@ test_expect_success PERL 'difftool forwards exit code with --trust-exit-code' '
test_must_fail git difftool -y --trust-exit-code -t error branch
'
+test_expect_success PERL 'difftool forwards exit code with --trust-exit-code for built-ins' '
+ test_config difftool.vimdiff.path false &&
+ test_must_fail git difftool -y --trust-exit-code -t vimdiff branch
+'
+
test_expect_success PERL 'difftool honors difftool.trustExitCode = true' '
test_config difftool.error.cmd false &&
test_config difftool.trustExitCode true &&