Re: [PATCH] diff: report bogus input to -C/-M/-B

From: Jeff King <peff@peff.net>
Date: Oct 21, 2010, 17:07 UTC
Message-ID: <20101021170744.GB15667@sigill.intra.peff.net>
In-Reply-To: <20101021165340.GE3732@burratino>

On Thu, Oct 21, 2010 at 11:53:40AM -0500, Jonathan Nieder wrote:

Show 20 quoted lines

> Jeff King wrote:
> 
> > Before:
> > 
> >   $ git diff -CM
> >   $ echo $?
> >   128
> > 
> > After:
> > 
> >   $ git diff -CM
> >   error: invalid argument to -C: M
> >   $ echo $?
> >   128
> 
> Yes, please.
> 
> Who is it that exits(128) in this code path?  Are there other
> functions it calls that might return an error without reporting it to
> stderr?

It's setup_revisions(). It only happens when calling handle_revision_opt(), which either succeeds, calls error() for its error cases, or chains to diff_opt_parse(). The latter uses error() appropriately except for the -B/-M/-C cases.

So I think we're good after this patch is applied.

-Peff