Thread (1 message) 1 message, 1 author, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:10

Carlos Martín Nieto [off-list ref] writes:
On Mon, 2012-02-27 at 14:43 -0500, Jeff King wrote:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help