From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Feb 2012 17:32:21 GMT
Subject: Re: [PATCH] branch: don't assume the merge filter ref exists
Message-ID: <7vehte27a2.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1330442090.691.9.camel@centaur.lab.cmartin.tk>

Carlos Martín Nieto <cmn@elego.de> writes:

> On Mon, 2012-02-27 at 14:43 -0500, Jeff King wrote:
>> 
>> 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.

Ok, so what I have is good for everybody.  Will merge to "next" and soon
to "master" and "maint".

Thanks, both.