diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-18 19:16:54 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-18 19:16:55 +0100 |
| commit | 3f78278beb9792368de7edbbb031c3a88e0038a1 (patch) | |
| tree | 42d7a2d7309fffd683ddd62b507ae1d65bea1a64 | |
| parent | Merge branch 'master' of git://github.com/git-l10n/git-po (diff) | |
| parent | difftool: honor --trust-exit-code for builtin tools (diff) | |
| download | git-3f78278beb9792368de7edbbb031c3a88e0038a1.tar.xz git-3f78278beb9792368de7edbbb031c3a88e0038a1.zip | |
Merge branch 'da/difftool'
Fix-up to a new feature in 'master'.
* da/difftool:
difftool: honor --trust-exit-code for builtin tools
| -rw-r--r-- | git-mergetool--lib.sh | 1 | ||||
| -rwxr-xr-x | t/t7800-difftool.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index a40d3dfea6..2b6635130a 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -221,6 +221,7 @@ run_merge_tool () { else run_diff_cmd "$1" fi + status=$? return $status } 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 && |