Re: [PATCH] branch: don't assume the merge filter ref exists

From: Carlos Martín Nieto <cmn@elego.de>
Date: Feb 28, 2012, 15:14 UTC
Message-ID: <1330442090.691.9.camel@centaur.lab.cmartin.tk>
In-Reply-To: <20120227194305.GE1600@sigill.intra.peff.net>

On Mon, 2012-02-27 at 14:43 -0500, Jeff King wrote:

Show 19 quoted lines

> On Mon, Feb 27, 2012 at 11:33:49AM -0800, Junio C Hamano wrote:
> 
> > Jeff King <peff@peff.net> writes:
> > 
> > > You would also get NULL if the object exists but is not a commit. Maybe:
> > >
> > >   die("object '%s' does not point to a commit", ...)
> > >
> > > would be better? It covers the wrong-type case, and is still technically
> > > true when the object does not exist.
> > 
> > For this particular message I like the above a lot better.  The output
> > from "git grep -e 'invalid object' -e 'bad object'" seems to show that
> > the use of both are fairly evenly distributed.
> 
> It looks like "bad object" generally comes from parse_object failing,
> which makes sense. It either means object corruption or you fed a full
> 40-char sha1 that didn't exist (which, if you are being that specific,
> probably is an indication of broken-ness in your repository).

Right. Another version of the fix I was playing with used parse_object after get_sha1 in opt_parse_merge_filter to make sure there that the objects did exist, so I copied that error message for this patch.

I see Junio's already squashed this in, and it's certainly a better message.

cmn