Git fork

git-mergetool--lib.sh: add error message if 'setup_user_tool' fails

In git-mergetool--lib.sh::setup_tool, we check if the given tool is a
known builtin tool, a known variant, or a user-defined tool by calling
setup_user_tool, and we return with the exit code from setup_user_tool
if it was called. setup_user_tool checks if {diff,merge}tool.$tool.cmd
is set and quietly returns with an error if not.

This leads to the following invocation quietly failing:

git mergetool --tool=unknown

which is not very user-friendly. Adjust setup_tool to output an error
message before returning if setup_user_tool returned with an error.

Note that we do not check the result of the second call to
setup_user_tool in setup_tool, as this call is only meant to allow users
to redefine 'cmd' for a builtin tool; it is not an error if they have
not done so.

Note that this behaviour of quietly failing is a regression dating back
to de8dafbada (mergetool: break setup_tool out into separate
initialization function, 2021-02-09), as before this commit an unknown
mergetool would be diagnosed in get_merge_tool_path when called from
run_merge_tool.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Philippe Blain and committed by
Junio C Hamano
bba503d4 00536761

+15 -2
+7 -2
git-mergetool--lib.sh
··· 159 159 } 160 160 161 161 valid_tool () { 162 - setup_tool "$1" && return 0 162 + setup_tool "$1" 2>/dev/null && return 0 163 163 cmd=$(get_merge_tool_cmd "$1") 164 164 test -n "$cmd" 165 165 } ··· 250 250 . "$MERGE_TOOLS_DIR/${tool%[0-9]}" 251 251 else 252 252 setup_user_tool 253 - return $? 253 + rc=$? 254 + if test $rc -ne 0 255 + then 256 + echo >&2 "error: ${TOOL_MODE}tool.$tool.cmd not set for tool '$tool'" 257 + fi 258 + return $rc 254 259 fi 255 260 256 261 # Now let the user override the default command for the tool. If
+8
t/t7610-mergetool.sh
··· 899 899 git commit -m "branch1 resolved with mergetool" 900 900 ' 901 901 902 + test_expect_success 'mergetool with non-existent tool' ' 903 + test_when_finished "git reset --hard" && 904 + git checkout -b test$test_count branch1 && 905 + test_must_fail git merge main && 906 + yes "" | test_must_fail git mergetool --tool=absent >out 2>&1 && 907 + test_grep "mergetool.absent.cmd not set for tool" out 908 + ' 909 + 902 910 test_done