diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-18 18:16:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-18 18:16:55 (GMT) |
| commit | 3f78278beb9792368de7edbbb031c3a88e0038a1 (patch) | |
| tree | 42d7a2d7309fffd683ddd62b507ae1d65bea1a64 /t | |
| parent | ea4f93eb99038329bbd692c5c8246e5ec8c11da9 (diff) | |
| parent | 99474b6340dbcbe58f6c256fdee231cbadb060f4 (diff) | |
| download | git-3f78278beb9792368de7edbbb031c3a88e0038a1.zip git-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.gz git-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.bz2 | |
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-x | t/t7800-difftool.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 69bde7a..ea35a02 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 && |