[PATCH 0/2] recover from "failed to apply delta"

From: Jeff King <peff@peff.net>
Date: Jun 14, 2013, 21:49 UTC
Message-ID: <20130614214943.GA29138@sigill.intra.peff.net>
In-Reply-To: <alpine.LFD.2.03.1306132004090.18597@syhkavp.arg>

On Thu, Jun 13, 2013 at 08:05:21PM -0400, Nicolas Pitre wrote:

Show 10 quoted lines

> > We already handle the case where we were not able to read
> > the delta from disk. However, when we find that the delta we
> > read does not apply, we simply die.  This case is harder to
> > trigger, as corruption in the delta data itself would
> > trigger a crc error from zlib.  However, a corruption that
> > pointed us at the wrong delta base might cause it.
>
> That makes sense.
> 
> Could you produce a test case to go along with this change?

Yes. I was a little worried I would have trouble doing it without relying on a lot of pack internals, but the infrastructure you set up in t5303 makes it relatively easy (and we do not have to make any assumptions that t5303 does not already make).

Here is a re-roll; the first patch is a small cleanup in t5303 that is required for the new tests to work.

  [1/2]: t5303: drop "count=1" from corruption dd
  [2/2]: unpack_entry: do not die when we fail to apply a delta

-Peff