mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
![David Aguilar](/assets/img/avatar_default.png)
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>
33 lines
602 B
Plaintext
33 lines
602 B
Plaintext
can_diff () {
|
|
return 1
|
|
}
|
|
|
|
merge_cmd () {
|
|
if $base_present
|
|
then
|
|
basename="$(basename "$merge_tool_path" .exe)"
|
|
if test "$basename" = "tortoisegitmerge"
|
|
then
|
|
"$merge_tool_path" \
|
|
-base "$BASE" -mine "$LOCAL" \
|
|
-theirs "$REMOTE" -merged "$MERGED"
|
|
else
|
|
"$merge_tool_path" \
|
|
-base:"$BASE" -mine:"$LOCAL" \
|
|
-theirs:"$REMOTE" -merged:"$MERGED"
|
|
fi
|
|
else
|
|
echo "$merge_tool_path cannot be used without a base" 1>&2
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
if type tortoisegitmerge >/dev/null 2>/dev/null
|
|
then
|
|
echo tortoisegitmerge
|
|
else
|
|
echo tortoisemerge
|
|
fi
|
|
}
|