Re: [PATCH] difftool: fix bug when printing usage

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi Junio,

On Mon, 6 Feb 2017, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > [... and he quoted someone ...]
> >
> >> +	# create a ceiling directory to prevent Git from finding a repo
> >> +	mkdir -p not/repo &&
> >> +	ceiling="$PWD/not" &&
> >> +	lines=$(cd not/repo &&
> >> +		GIT_CEILING_DIRECTORIES="$ceiling" git difftool -h |
> >> +		grep ^usage: | wc -l) &&
> >> +	test "$lines" -eq 1 &&
> >
> > Likewise, this would become
> >
> > 	GIT_CEILING_DIRECTORIES="$PWD/not" \
> > 	test_expect_code 129 git -C not/repo difftool -h >output &&
> > 	grep ^usage: output
> 
> I agree with the intent, but the execution here is "Not quite".
> test_expect_code being a shell function, it does not take the
> "one-shot environment assignment for this single invocation," like
> external commands do.

So now that we know what is wrong, can you please enlighten me about what
is right?

Thanks,
Johannes