Re: [PATCH 2/2] difftool: don't assume that default sh is sane
From: David Aguilar <hidden>
Date: 2016-06-15 23:02:04
On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote:
From: Charles Bailey <redacted> git-difftool used to create a command list script containing $( ... ) and explicitly call "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 <redacted> --- Another issue for Solaris. Originally I had a fix for this that substituted "@SHELL_PATH@" even inside perl scripts but I felt that having an interface for show_tool_help was a little neater all round but I welcome alternative views.
I definitely agree that having an interface is nice and tidy.
quoted hunk ↗ jump to hunk
git-difftool.perl | 6 +----- git-mergetool.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 6 deletions(-)diff --git a/git-difftool.perl b/git-difftool.perl index 18ca61e..598fcc2 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));
I believe qw() in list context is considered deprecated. cheers, -- David