git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] difftool: don't assume that default sh is sane

From
David Aguilar <davvid@gmail.com>
Date
Jul 29, 2014, 08:03 UTC
Message-ID
<20140729080322.GB20724@gmail.com>
In-Reply-To
<20140729075328.GA20724@gmail.com>
On Tue, Jul 29, 2014 at 12:53:29AM -0700, David Aguilar wrote:
Show 19 quoted lines
> On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote:
> > 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.

Sorry for the noise, I got my warnings mixed up. It's only deprecated when used as parentheses, so this is fine as-is.

-- 
David
Previous: David Aguilar
Message 6 of 6 in “mergetool: don't require a work tree for --tool-help”
  1. 1/2 mergetool: don't require a work tree for --tool-helpCharles Bailey, Jul 19, 2014
  2. 2/2 difftool: don't assume that default sh is saneCharles Bailey, Jul 19, 2014
  3. John KeepingJul 19, 2014
  4. Charles BaileyJul 19, 2014
  5. David AguilarJul 29, 2014
  6. David AguilarJul 29, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.