From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Nicolas Pitre <nico@fluxnic.net>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] unpack_entry: do not die when we fail to apply a delta
Date: Fri, 14 Jun 2013 14:59:00 -0700 [thread overview]
Message-ID: <7vk3lwmk0r.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130614215334.GB3821@sigill.intra.peff.net> (Jeff King's message of "Fri, 14 Jun 2013 17:53:34 -0400")
Jeff King <peff@peff.net> writes:
> test_expect_success \
> + 'corruption of delta base reference pointing to wrong object' \
> + 'create_new_pack --delta-base-offset &&
> + git prune-packed &&
> + printf "\220\033" | do_corrupt_object $blob_3 2 &&
Interesting. You cheated in a different way with a hardcoded
offset, instead of hardcoded knowledge of where the object name
is stored in binary in the .idx file ;-)
> + git cat-file blob $blob_1 >/dev/null &&
> + git cat-file blob $blob_2 >/dev/null &&
> + test_must_fail git cat-file blob $blob_3 >/dev/null'
> +
> +test_expect_success \
> + '... but having a loose copy allows for full recovery' \
> + 'mv ${pack}.idx tmp &&
> + git hash-object -t blob -w file_3 &&
> + mv tmp ${pack}.idx &&
> + git cat-file blob $blob_1 > /dev/null &&
> + git cat-file blob $blob_2 > /dev/null &&
> + git cat-file blob $blob_3 > /dev/null'
> +
> +test_expect_success \
> + '... and then a repack "clears" the corruption' \
> + 'do_repack --delta-base-offset --no-reuse-delta &&
> + git prune-packed &&
> + git verify-pack ${pack}.pack &&
> + git cat-file blob $blob_1 > /dev/null &&
> + git cat-file blob $blob_2 > /dev/null &&
> + git cat-file blob $blob_3 > /dev/null'
Nice. Will replace the one I queued yesterday with these two patches.
> +test_expect_success \
> 'corrupting header to have too small output buffer fails unpack' \
> 'create_new_pack &&
> git prune-packed &&
next prev parent reply other threads:[~2013-06-14 21:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 23:26 [PATCH] unpack_entry: do not die when we fail to apply a delta Jeff King
2013-06-14 0:05 ` Nicolas Pitre
2013-06-14 21:49 ` [PATCH 0/2] recover from "failed to apply delta" Jeff King
2013-06-14 21:51 ` [PATCH 1/2] t5303: drop "count=1" from corruption dd Jeff King
2013-06-14 21:51 ` [PATCH 0/2] recover from "failed to apply delta" Junio C Hamano
2013-06-14 21:56 ` Jeff King
2013-06-14 22:23 ` Junio C Hamano
2013-06-14 21:53 ` [PATCH 2/2] unpack_entry: do not die when we fail to apply a delta Jeff King
2013-06-14 21:59 ` Junio C Hamano [this message]
2013-06-14 22:19 ` Jeff King
2013-06-14 14:53 ` [PATCH] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vk3lwmk0r.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).