Merge branch 'da/difftool'

Fix-up to a new feature in 'master'. * da/difftool: difftool: honor --trust-exit-code for builtin tools
git-mirror · Nov 18, 2014 · 3f78278 · 3f78278
2 parents ea4f93e + 99474b6
commit 3f78278
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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 &&