mergetools/vimdiff: trust Vim's exit code

davvid · gitster · commit 2967284456e9 · 2016-11-29T10:57:41.000-08:00
Allow vimdiff users to signal that they do not want to use the
result of a merge by exiting with ":cquit", which tells Vim to
exit with an error code.

This is better than the current behavior because it allows users
to directly flag that the merge is bad, using a standard Vim
feature, rather than relying on a timestamp heuristic that is
unforgiving to users that save in-progress merge files.

The original behavior can be restored by configuring
mergetool.vimdiff.trustExitCode to false.

Reported-by: Dun Peal &lt;dunpealer@gmail.com&gt;
Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
@@ -42,3 +42,7 @@ translate_merge_tool_path() {
 		;;
 	esac
 }
+
+exit_code_trustable () {
+	true
+}

Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,7 @@ translate_merge_tool_path() {`
`42`	`42`	`;;`
`43`	`43`	`esac`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+exit_code_trustable () {`
	`47`	`+ true`
	`48`	`+}`