Re: diff: --quiet does not imply --exit-code if --diff-filter is present

From: Yasushi SHOJI <yashi@atmark-techno.com>
Date: Jun 1, 2011, 09:41 UTC
Message-ID: <87pqmxkhwj.wl@dns1.atmark-techno.com>
In-Reply-To: <20110531153356.GB2594@sigill.intra.peff.net>

Hi Jeff,

At Tue, 31 May 2011 11:33:56 -0400, Jeff King wrote:

Show 14 quoted lines

> 
> On Tue, May 31, 2011 at 07:34:39PM +0900, Yasushi SHOJI wrote:
> 
> > just noticed that quiet does not return exit code when I set
> > diff-filter.  at the current tip (v1.7.5.3-401-gfb674d7):
> > 
> >   git diff --quiet     --diff-filter=A v1.7.5 v1.7.5.1 -- t  #=> 0
> >   git diff --exit-code --diff-filter=A v1.7.5 v1.7.5.1 -- t  #=> 1
> > 
> > these two line returns different exit code.
> > 
> > is this a bug or a feature?
> 
> It's a bug.

your patch works like a charm.  Thanks.

Show 6 quoted lines

> Commit 2cfe8a6 (diff --quiet: disable optimization when
> --diff-filter=X is used, 2011-03-16) fixes this in some
> cases by disabling the optimization when a filter is
> present. However, it only tweaked run_diff_files, missing
> the similar case in diff_tree. Thus the fix worked only for
> diffing the working tree and index, but not between trees.

oh, sorry about not realizing the commit 2cfe8a6.

regards,

-- 
           yashi