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

2014-07-29 Thread David Aguilar
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 @@ su

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

2014-07-29 Thread David Aguilar
On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote: > From: Charles Bailey > > 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 di

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

2014-07-19 Thread Charles Bailey
On Sat, Jul 19, 2014 at 06:21:32PM +0100, John Keeping wrote: > > What's the reason for forcing `--tool-help` to be the last option? > Wouldn't it be simpler to just change the top-level case statement to: > > --tool-help=*) > TOOL_MODE=${1#--tool-help=} > show_t

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

2014-07-19 Thread John Keeping
On Sat, Jul 19, 2014 at 05:35:17PM +0100, Charles Bailey wrote: > From: Charles Bailey > > 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 di

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

2014-07-19 Thread Charles Bailey
From: Charles Bailey 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