summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2016-11-29 09:38:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-11-29 18:54:03 (GMT)
commit7c10605d2ccf499af6136e993cf248892be39168 (patch)
treefd2c42ea696c365423d767225278d8cd8c49b516 /mergetools/p4merge
parentac84098b7e32406a982ac01cc76a663d5605224b (diff)
downloadgit-7c10605d2ccf499af6136e993cf248892be39168.zip
git-7c10605d2ccf499af6136e993cf248892be39168.tar.gz
git-7c10605d2ccf499af6136e993cf248892be39168.tar.bz2
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 <dunpealer@gmail.com> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
-rw-r--r--mergetools/p4merge2
1 files changed, 0 insertions, 2 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge
index 5a608ab..7a5b291 100644
--- a/mergetools/p4merge
+++ b/mergetools/p4merge
@@ -20,14 +20,12 @@ diff_cmd () {
}
merge_cmd () {
- touch "$BACKUP"
if ! $base_present
then
cp -- "$LOCAL" "$BASE"
create_virtual_base "$BASE" "$REMOTE"
fi
"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
- check_unchanged
}
create_empty_file () {