From: Philippe Blain via GitGitGadget Date: Wed, 13 Nov 2024 00:52:07 GMT Subject: [PATCH 4/5] git-mergetool--lib.sh: add error message for unknown tool variant Message-ID: <74b83caa1e5c1a63248dd4dcbaf2cf450f9cf32d.1731459128.git.gitgitgadget@gmail.com> In-Reply-To: From: Philippe Blain 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 --- git-mergetool--lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index f4786afc63f..9a00fabba27 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -263,6 +263,7 @@ setup_tool () { if ! list_tool_variants | grep -q "^$tool$" then + echo "error: unknown ${tool%[0-9]} variant '$tool'" >&2 return 1 fi -- gitgitgadget