[PATCH 3/4] git-mergetool: don't hardcode 'mergetool' in show_tool_help
- From
John Keeping <john@keeping.me.uk>
- Date
- Jan 24, 2013, 19:55 UTC
- Message-ID
- <bbf604e6903a23c5c8e7b920b38175a39564f946.1359057056.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1359057056.git.john@keeping.me.uk>
When using show_tool_help from git-difftool we will want it to print "git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool".
Signed-off-by: John Keeping <john@keeping.me.uk> --- git-mergetool--lib.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 1748315..4c1e129 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -188,12 +188,14 @@ show_tool_help () { unavailable="$unavailable$i$LF" fi done + + cmd_name=${TOOL_MODE}tool if test -n "$available" then - echo "'git mergetool --tool=<tool>' may be set to one of the following:" + echo "'git $cmd_name --tool=<tool>' may be set to one of the following:" echo "$available" | sort | sed -e 's/^/ /' else - echo "No suitable tool for 'git mergetool --tool=<tool>' found." + echo "No suitable tool for 'git $cmd_name --tool=<tool>' found." fi if test -n "$unavailable" then
-- 1.8.1