From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Fri, 22 Nov 2024 19:50:21 +0000 (+0000)
Subject: git-mergetool--lib.sh: add error message for unknown tool variant
X-Git-Tag: v2.48.0-rc0~22^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acca46d12464cc64b623b104c04977d8db1a9591;p=thirdparty%2Fgit.git

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

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index d7e410d948..11ea181259 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -264,6 +264,7 @@ setup_tool () {
 
 	if ! list_tool_variants | grep -q "^$tool$"
 	then
+		echo "error: unknown tool variant '$tool'" >&2
 		return 1
 	fi