undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: don't assume that default sh is sane

Browse Source 
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>
This commit is contained in:
Charles Bailey 2014-10-11 01:39:38 -07:00 committed by Junio C Hamano
parent 7bfb7c357c
commit 4fb4b02d98
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-difftool.perl
View File

@ -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));
}

4
git-mergetool.sh
View File

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