mirror of
https://github.com/git/git
synced 2024-10-30 13:20:15 +00:00
7c10605d2c
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>
36 lines
617 B
Text
36 lines
617 B
Text
diff_cmd () {
|
|
empty_file=
|
|
|
|
# p4merge does not like /dev/null
|
|
if test "/dev/null" = "$LOCAL"
|
|
then
|
|
LOCAL="$(create_empty_file)"
|
|
fi
|
|
if test "/dev/null" = "$REMOTE"
|
|
then
|
|
REMOTE="$(create_empty_file)"
|
|
fi
|
|
|
|
"$merge_tool_path" "$LOCAL" "$REMOTE"
|
|
|
|
if test -n "$empty_file"
|
|
then
|
|
rm -f "$empty_file"
|
|
fi
|
|
}
|
|
|
|
merge_cmd () {
|
|
if ! $base_present
|
|
then
|
|
cp -- "$LOCAL" "$BASE"
|
|
create_virtual_base "$BASE" "$REMOTE"
|
|
fi
|
|
"$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED"
|
|
}
|
|
|
|
create_empty_file () {
|
|
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
|
|
>"$empty_file"
|
|
|
|
printf "%s" "$empty_file"
|
|
}
|