From: Charles Bailey <cbailey32@bloomberg.net>
Date: Sat, 11 Oct 2014 08:39:38 +0000 (-0700)
Subject: difftool: don't assume that default sh is sane
X-Git-Tag: v2.2.0-rc0~29^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fb4b02d98310f4f859f7d52f57f36d49198be5c;p=thirdparty%2Fgit.git

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>
---

diff --git a/git-difftool.perl b/git-difftool.perl
index 18ca61e8d0..598fcc23b9 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -47,13 +47,9 @@ sub find_worktree
 
 sub print_tool_help
 {
-	my $cmd = 'TOOL_MODE=diff';
-	$cmd .= ' && . "$(git --exec-path)/git-mergetool--lib"';
-	$cmd .= ' && show_tool_help';
-
 	# See the comment at the bottom of file_diff() for the reason behind
 	# using system() followed by exit() instead of exec().
-	my $rc = system('sh', '-c', $cmd);
+	my $rc = system(qw(git mergetool --tool-help=diff));
 	exit($rc | ($rc >> 8));
 }
 
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
 		;;