git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 4/5] git-mergetool--lib.sh: add error message for unknown tool variant

From
Philippe Blain <levraiphilippeblain@gmail.com>
Date
Nov 22, 2024, 19:08 UTC
Message-ID
<506f944b-033a-07ad-2c46-581eeb9799ef@gmail.com>
In-Reply-To
<xmqqr07f28ow.fsf@gitster.g>
Le 2024-11-12 à 21:01, Junio C Hamano a écrit :
Show 45 quoted lines
> "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
>> From: Philippe Blain <levraiphilippeblain@gmail.com>
>>
>> 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.
> 
> Makes sense, but ...
> 
>> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
>> ---
>>  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
> 
> ... I do not understand why you strip a single digit from the end.
> 
>     git mergetool --tool=nvimdiff4
> 
> says 'nvimdiff4' is not known as a variant of 'nvimdiff', but
> wouldn't it still be a variant of 'vimdiff'?  Of course,
> 
>     git mergetool --tool=nvimdiff48
> 
> gets a vastly different error message ;-)
> 
> Saying
> 
> 	echo >&2 "error: unknown variant '$tool'"
> 
> may be sufficient, perhaps?  I dunno.

the stripping of the last digit is just because I copied from the 'if' a few lines above, where we source "$MERGE_TOOLS_DIR/${tool%[0-9]}". In MERGE_TOOLS_DIR we have 'nvimdiff' and 'gvimdiff' that simply source vimdiff, so this works. But I agree that we can simplify the error message, I'll do that.

Previous: Junio C HamanoNext: Philippe Blain via GitGitGadget
Message 12 of 20 in “git-mergetool: improve error code paths and messages”
  1. 0/5 git-mergetool: improve error code paths and messagesPhilippe Blain via GitGitGadget, Nov 13, 2024
  2. 1/5 completion: complete '--tool-help' in 'git mergetool'Philippe Blain via GitGitGadget, Nov 13, 2024
  3. 2/5 git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown toolPhilippe Blain via GitGitGadget, Nov 13, 2024
  4. Junio C HamanoNov 13, 2024
  5. Philippe BlainNov 22, 2024
  6. Philippe BlainNov 22, 2024
  7. 3/5 git-mergetool--lib.sh: add error message in 'setup_user_tool'Philippe Blain via GitGitGadget, Nov 13, 2024
  8. Junio C HamanoNov 13, 2024
  9. Philippe BlainNov 22, 2024
  10. 4/5 git-mergetool--lib.sh: add error message for unknown tool variantPhilippe Blain via GitGitGadget, Nov 13, 2024
  11. Junio C HamanoNov 13, 2024
  12. Philippe BlainNov 22, 2024
  13. 5/5 git-difftool--helper.sh: exit upon initialize_merge_tool errorsPhilippe Blain via GitGitGadget, Nov 13, 2024
  14. 0/5 git-mergetool: improve error code paths and messagesPhilippe Blain via GitGitGadget, Nov 22, 2024
  15. 1/5 completion: complete '--tool-help' in 'git mergetool'Philippe Blain via GitGitGadget, Nov 22, 2024
  16. 2/5 git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown toolPhilippe Blain via GitGitGadget, Nov 22, 2024
  17. 3/5 git-mergetool--lib.sh: add error message if 'setup_user_tool' failsPhilippe Blain via GitGitGadget, Nov 22, 2024
  18. 4/5 git-mergetool--lib.sh: add error message for unknown tool variantPhilippe Blain via GitGitGadget, Nov 22, 2024
  19. 5/5 git-difftool--helper.sh: exit upon initialize_merge_tool errorsPhilippe Blain via GitGitGadget, Nov 22, 2024
  20. Junio C HamanoNov 26, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.