Commit 62957bea authored by John Keeping's avatar John Keeping Committed by Junio C Hamano

mergetool--lib: don't call "exit" in setup_tool

This will make it easier to use setup_tool in places where we expect
that the selected tool will not support the current mode.

We need to introduce a new return code for setup_tool to differentiate
between the case of "the selected tool is invalid" and "the selected
tool is not a built-in" since we must call setup_tool when a custom
'merge.<tool>.path' is configured for a built-in tool but avoid failing
when the configured tool is not a built-in.
Signed-off-by: John Keeping's avatarJohn Keeping <[email protected]>
Signed-off-by: David Aguilar's avatarDavid Aguilar <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 88d3406a
......@@ -58,7 +58,11 @@ setup_tool () {
. "$mergetools/defaults"
if ! test -f "$mergetools/$tool"
return 1
# Use a special return code for this case since we want to
# source "defaults" even when an explicit tool path is
# configured since the user can use that to override the
# default path in the scriptlet.
return 2
# Load the redefined functions
......@@ -67,11 +71,11 @@ setup_tool () {
if merge_mode && ! can_merge
echo "error: '$tool' can not be used to resolve merges" >&2
exit 1
return 1
elif diff_mode && ! can_diff
echo "error: '$tool' can only be used to resolve merges" >&2
exit 1
return 1
return 0
......@@ -101,6 +105,19 @@ run_merge_tool () {
# Bring tool-specific functions into scope
setup_tool "$1"
case $exitcode in
# The configured tool is not a built-in tool.
test -n "$merge_tool_path" || return 1
return $exitcode
if merge_mode
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment