From 4fb4b02d98310f4f859f7d52f57f36d49198be5c Mon Sep 17 00:00:00 2001
From: Charles Bailey <cbailey32@bloomberg.net>
Date: Sat, 11 Oct 2014 01:39:38 -0700
Subject: difftool: don't assume that default sh is sane

git-difftool used to create a command list script containing $( ... )
and explicitly calls "sh -c" with this list.

Instead, allow mergetool --tool-help to take a mode parameter and call
mergetool directly to invoke the show_tool_help function. This mode
parameter is intented for use solely by difftool.

Signed-off-by: Charles Bailey <cbailey32@bloomberg.net>
Helped-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 git-mergetool.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'git-mergetool.sh')

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 8098d2dc07..821253e368 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -326,6 +326,10 @@ prompt=$(git config --bool mergetool.prompt || echo true)
 while test $# != 0
 do
 	case "$1" in
+	--tool-help=*)
+		TOOL_MODE=${1#--tool-help=}
+		show_tool_help
+		;;
 	--tool-help)
 		show_tool_help
 		;;
-- 
cgit v1.2.3