Skip to content

Commit acca46d

Browse files
phil-blaingitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bba503d commit acca46d

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-mergetool--lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ setup_tool () {
264264

265265
if ! list_tool_variants | grep -q "^$tool$"
266266
then
267+
echo "error: unknown tool variant '$tool'" >&2
267268
return 1
268269
fi
269270

0 commit comments

Comments
 (0)