path: root/mergetools/tkdiff
diff options
authorDavid Aguilar <>2016-11-29 09:38:07 (GMT)
committerJunio C Hamano <>2016-11-29 18:54:03 (GMT)
commit7c10605d2ccf499af6136e993cf248892be39168 (patch)
treefd2c42ea696c365423d767225278d8cd8c49b516 /mergetools/tkdiff
parentac84098b7e32406a982ac01cc76a663d5605224b (diff)
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
Built-in merge tools contain a hard-coded assumption about whether or not a tool's exit code can be trusted to determine the success or failure of a merge. Tools whose exit codes are not trusted contain calls to check_unchanged() in their merge_cmd() functions. A problem with this is that the trustExitCode configuration is not honored for built-in tools. Teach built-in tools to honor the trustExitCode configuration. Extend run_merge_cmd() so that it is responsible for calling check_unchanged() when a tool's exit code cannot be trusted. Remove check_unchanged() calls from scriptlets since they are no longer responsible for calling it. When no configuration is present, exit_code_trustable() is checked to see whether the exit code should be trusted. The default implementation returns false. Tools whose exit codes can be trusted override exit_code_trustable() to true. Reported-by: Dun Peal <> Signed-off-by: David Aguilar <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'mergetools/tkdiff')
1 files changed, 4 insertions, 0 deletions
diff --git a/mergetools/tkdiff b/mergetools/tkdiff
index 618c438..eee5cb5 100644
--- a/mergetools/tkdiff
+++ b/mergetools/tkdiff
@@ -10,3 +10,7 @@ merge_cmd () {
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
+exit_code_trustable () {
+ true