git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Seth House <seth@eseth.com>, David Aguilar <davvid@gmail.com>,
	Johannes Sixt <j6t@kdbg.org>,
	Philippe Blain <levraiphilippeblain@gmail.com>,
	Philippe Blain <levraiphilippeblain@gmail.com>
Subject: [PATCH 2/5] git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
Date: Wed, 13 Nov 2024 00:52:05 +0000	[thread overview]
Message-ID: <6f7f553b283078ba3c81190686b150a87d901240.1731459128.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1827.git.1731459128.gitgitgadget@gmail.com>

From: Philippe Blain <levraiphilippeblain@gmail.com>

In git-mergetool--lib.sh::get_merge_tool_path, we check if the chosen
tool is valid via valid_tool and exit with an error message if not. This
error message mentions "Unknown merge tool", even if the command the
user tried was 'git difftool --tool=unknown'. Use the global 'TOOL_MODE'
variable for a more correct error message.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
---
 git-mergetool--lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 1ff26170ffc..269a60ea44c 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -474,7 +474,7 @@ get_merge_tool_path () {
 	merge_tool="$1"
 	if ! valid_tool "$merge_tool"
 	then
-		echo >&2 "Unknown merge tool $merge_tool"
+		echo >&2 "Unknown $TOOL_MODE tool $merge_tool"
 		exit 1
 	fi
 	if diff_mode
-- 
gitgitgadget


  parent reply	other threads:[~2024-11-13  0:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-13  0:52 [PATCH 0/5] git-mergetool: improve error code paths and messages Philippe Blain via GitGitGadget
2024-11-13  0:52 ` [PATCH 1/5] completion: complete '--tool-help' in 'git mergetool' Philippe Blain via GitGitGadget
2024-11-13  0:52 ` Philippe Blain via GitGitGadget [this message]
2024-11-13  1:27   ` [PATCH 2/5] git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool Junio C Hamano
2024-11-22 18:57     ` Philippe Blain
2024-11-22 19:32       ` Philippe Blain
2024-11-13  0:52 ` [PATCH 3/5] git-mergetool--lib.sh: add error message in 'setup_user_tool' Philippe Blain via GitGitGadget
2024-11-13  1:48   ` Junio C Hamano
2024-11-22 19:02     ` Philippe Blain
2024-11-13  0:52 ` [PATCH 4/5] git-mergetool--lib.sh: add error message for unknown tool variant Philippe Blain via GitGitGadget
2024-11-13  2:01   ` Junio C Hamano
2024-11-22 19:08     ` Philippe Blain
2024-11-13  0:52 ` [PATCH 5/5] git-difftool--helper.sh: exit upon initialize_merge_tool errors Philippe Blain via GitGitGadget
2024-11-22 19:50 ` [PATCH v2 0/5] git-mergetool: improve error code paths and messages Philippe Blain via GitGitGadget
2024-11-22 19:50   ` [PATCH v2 1/5] completion: complete '--tool-help' in 'git mergetool' Philippe Blain via GitGitGadget
2024-11-22 19:50   ` [PATCH v2 2/5] git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool Philippe Blain via GitGitGadget
2024-11-22 19:50   ` [PATCH v2 3/5] git-mergetool--lib.sh: add error message if 'setup_user_tool' fails Philippe Blain via GitGitGadget
2024-11-22 19:50   ` [PATCH v2 4/5] git-mergetool--lib.sh: add error message for unknown tool variant Philippe Blain via GitGitGadget
2024-11-22 19:50   ` [PATCH v2 5/5] git-difftool--helper.sh: exit upon initialize_merge_tool errors Philippe Blain via GitGitGadget
2024-11-26  4:33   ` [PATCH v2 0/5] git-mergetool: improve error code paths and messages Junio C Hamano

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=6f7f553b283078ba3c81190686b150a87d901240.1731459128.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=levraiphilippeblain@gmail.com \
    --cc=seth@eseth.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).