Git fork

git-mergetool--lib.sh: add error message for unknown tool variant

In setup_tool, we check if the given tool is a known variant of a tool,
and quietly return with an error if not. This leads to the following
invocation quietly failing:

git mergetool --tool=vimdiff4

Add an error message before returning in this case.

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
acca46d1 bba503d4

+1
+1
git-mergetool--lib.sh
··· 264 265 if ! list_tool_variants | grep -q "^$tool$" 266 then 267 return 1 268 fi 269
··· 264 265 if ! list_tool_variants | grep -q "^$tool$" 266 then 267 + echo "error: unknown tool variant '$tool'" >&2 268 return 1 269 fi 270