All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org
Cc: "Johannes Sixt" <j6t@kdbg.org>,
	"Felipe Contreras" <felipe.contreras@gmail.com>,
	pudinha <rogi@skylittlesystem.org>, "René Scharfe" <l.s.r@web.de>,
	"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v3] mergetool--lib: fix '--tool-help' to correctly show available tools
Date: Thu, 7 Jan 2021 08:37:05 -0500	[thread overview]
Message-ID: <e5d24e6e-9a69-aa1f-483b-b892497a0e20@gmail.com> (raw)
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

      reply	other threads:[~2021-01-07 13:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-28 18:22 [PATCH] mergetool--lib: fix '--tool-help' to correctly show available tools Philippe Blain via GitGitGadget
2020-12-28 19:41 ` [PATCH v2] " Philippe Blain via GitGitGadget
2021-01-06 13:16   ` SZEDER Gábor
2021-01-06 13:34     ` Philippe Blain
2021-01-06 21:15     ` Junio C Hamano
2021-01-06 22:59       ` Philippe Blain
2021-01-06 23:06         ` Junio C Hamano
2021-01-07  0:32           ` Philippe Blain
2021-01-07  1:09   ` [PATCH v3] " Philippe Blain via GitGitGadget
2021-01-07 13:37     ` Philippe Blain [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e5d24e6e-9a69-aa1f-483b-b892497a0e20@gmail.com \
    --to=levraiphilippeblain@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=j6t@kdbg.org \
    --cc=l.s.r@web.de \
    --cc=rogi@skylittlesystem.org \
    --cc=szeder.dev@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.