git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] difftool: don't assume that default sh is sane
Date: Tue, 29 Jul 2014 01:03:23 -0700	[thread overview]
Message-ID: <20140729080322.GB20724@gmail.com> (raw)
In-Reply-To: <20140729075328.GA20724@gmail.com>

On Tue, Jul 29, 2014 at 12:53:29AM -0700, David Aguilar wrote:
> 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

      reply	other threads:[~2014-07-29  8:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-19 16:35 [PATCH 1/2] mergetool: don't require a work tree for --tool-help Charles Bailey
2014-07-19 16:35 ` [PATCH 2/2] difftool: don't assume that default sh is sane Charles Bailey
2014-07-19 17:21   ` John Keeping
2014-07-19 18:29     ` Charles Bailey
2014-07-29  7:53   ` David Aguilar
2014-07-29  8:03     ` David Aguilar [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140729080322.GB20724@gmail.com \
    --to=davvid@gmail.com \
    --cc=charles@hashpling.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).