Subject: Re: [PATCH v3 2/3] mergetool: don't require a work tree for --tool-help

From: David Aguilar <[email-masked]>
Date: Tue, 14 Oct 2014 23:48:26 -0700

On Tue, Oct 14, 2014 at 11:35:11PM -0700, David Aguilar wrote:
> On Mon, Oct 13, 2014 at 12:16:55PM -0700, Junio C Hamano wrote:
> > David Aguilar <[email-masked]> writes:
> > 
> > > From: Charles Bailey <[email-masked]>
> > >
> > > Signed-off-by: Charles Bailey <[email-masked]>
> > > Signed-off-by: David Aguilar <[email-masked]>
> > > ---
> > > Changes since v2:
> > >
> > > This now uses the new git_dir_init function.
> > >
> > >  git-mergetool.sh | 5 ++++-
> > >  1 file changed, 4 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/git-mergetool.sh b/git-mergetool.sh
> > > index 96a61ba..cddb533 100755
> > > --- a/git-mergetool.sh
> > > +++ b/git-mergetool.sh
> > > @@ -10,11 +10,11 @@
> > >  
> > >  USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
> > >  SUBDIRECTORY_OK=Yes
> > > +NONGIT_OK=Yes
> > >  OPTIONS_SPEC=
> > >  TOOL_MODE=merge
> > >  . git-sh-setup
> > >  . git-mergetool--lib
> > > -require_work_tree
> > >  
> > >  # Returns true if the mode reflects a symlink
> > >  is_symlink () {
> > > @@ -378,6 +378,9 @@ prompt_after_failed_merge () {
> > >  	done
> > >  }
> > >  
> > > +require_work_tree
> > > +git_dir_init
> > 
> > This is somewhat curious.  Shouldn't the order of these swapped?
> 
> Yes.  I'll send a replacement patch for 2/3 only.

Nevermind, I noticed you already fixed this up in pu.

Thank you,
-- 
David