global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'da/difftool'

Browse Source 
Fix-up to a new feature in 'master'.

* da/difftool:
  difftool: honor --trust-exit-code for builtin tools
This commit is contained in:
Junio C Hamano
2014-11-18 10:16:54 -08:00
parent ea4f93eb99 99474b6340
commit 3f78278beb
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
git-mergetool--lib.sh
View File

@@ -221,6 +221,7 @@ run_merge_tool () {
else else
run_diff_cmd "$1" run_diff_cmd "$1"
fi fi
status=$?
return $status return $status
} }

5
t/t7800-difftool.sh
View File

@@ -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_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_expect_success PERL 'difftool honors difftool.trustExitCode = true' '
test_config difftool.error.cmd false && test_config difftool.error.cmd false &&
test_config difftool.trustExitCode true && test_config difftool.trustExitCode true &&