summaryrefslogtreecommitdiff
path: root/git-rebase--am.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-06-14 17:53:34 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-14 14:56:09 -0700
commit1ee886c1f08f4dd672a342b7811191b02291a597 (patch)
tree8f72c892de4f1342f34e0f2e87bdfe5ea79b66f8 /git-rebase--am.sh
parentt5303: drop "count=1" from corruption dd (diff)
downloadtgif-1ee886c1f08f4dd672a342b7811191b02291a597.tar.xz
unpack_entry: do not die when we fail to apply a delta
When we try to load an object from disk and fail, our general strategy is to see if we can get it from somewhere else (e.g., a loose object). That lets users fix corruption problems by copying known-good versions of objects into the object database. 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. We can do the same "fail and try to find the object elsewhere" trick instead of dying. This not only gives us a chance to recover, but also puts us on code paths that will alert the user to the problem (with the current message, they do not even know which sha1 caused the problem). Note that unlike some other pack corruptions, we do not recover automatically from this case when doing a repack. There is nothing apparently wrong with the delta, as it points to a valid, accessible object, and we realize the error only when the resulting size does not match up. And in theory, one could even have a case where the corrupted size is the same, and the problem would only be noticed by recomputing the sha1. We can get around this by recomputing the deltas with --no-reuse-delta, which our test does (and this is probably good advice for anyone recovering from pack corruption). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--am.sh')
0 files changed, 0 insertions, 0 deletions