From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu, 07 Jan 2021 13:37:05 GMT
Subject: Re: [PATCH v3] mergetool--lib: fix '--tool-help' to correctly show available tools
Message-ID: <e5d24e6e-9a69-aa1f-483b-b892497a0e20@gmail.com>
In-Reply-To: <pull.825.v3.git.1609981745668.gitgitgadget@gmail.com>



Le 2021-01-06 à 20:09, Philippe Blain via GitGitGadget a écrit :
> From: Philippe Blain <levraiphilippeblain@gmail.com>
> 
> ...
> ---
>      Fix regression in 'git {diff,merge}tool --tool-help'
>      
>      Changes since v1:
>      
>       * Changed commit authorship (v1 sent with wrong identity).
>      
>      v1: I went with Johannes' suggestion finally because upon further
>      inspection, René's patch for some reason (I did not debug further)
>      caused to code to never reach 'any_shown=yes' in show_tool_help,
>      therefore changing the output of the command.
>      
>      I guess it's too late for inclusion in 2.30...

Forgot to summarize changes since v2:

- rewrote the description of the symptom of the bug to reflect what
was really happening
- changed the test to not rely on hard-coding the number of tools,
and just checking a few known tools are shown instead