diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2024-11-22 19:50:19 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-25 11:59:19 +0900 |
| commit | 00536761df113c8ad935c78bf407e427fce2f040 (patch) | |
| tree | dbb514a26c1dfd2d0f9b88fa12abfb808380ca9e | |
| parent | fe99a52225d56af16d283c769f14957d3c002471 (diff) | |
| download | git-00536761df113c8ad935c78bf407e427fce2f040.tar.gz | |
git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-mergetool--lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 1ff26170ff..269a60ea44 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 |