From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 2/4] Stop verify_packfile() as soon as an error occurs
Date: Fri, 4 Nov 2011 22:47:48 +0700 [thread overview]
Message-ID: <1320421670-518-3-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1320421670-518-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
pack-check.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/pack-check.c b/pack-check.c
index 0c19b6e..e33ea79 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -79,6 +79,8 @@ static int verify_packfile(struct packed_git *p,
err = error("%s SHA1 does not match its index",
p->pack_name);
unuse_pack(w_curs);
+ if (err)
+ return err;
/* Make sure everything reachable from idx is valid. Since we
* have verified that nr_objects matches between idx and pack,
@@ -106,11 +108,13 @@ static int verify_packfile(struct packed_git *p,
off_t offset = entries[i].offset;
off_t len = entries[i+1].offset - offset;
unsigned int nr = entries[i].nr;
- if (check_pack_crc(p, w_curs, offset, len, nr))
+ if (check_pack_crc(p, w_curs, offset, len, nr)) {
err = error("index CRC mismatch for object %s "
"from %s at offset %"PRIuMAX"",
sha1_to_hex(entries[i].sha1),
p->pack_name, (uintmax_t)offset);
+ break;
+ }
}
data = unpack_entry(p, entries[i].offset, &type, &size);
if (!data) {
--
1.7.4.74.g639db
next prev parent reply other threads:[~2011-11-04 15:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 15:47 [PATCH 0/4] fsck improvements Nguyễn Thái Ngọc Duy
2011-11-04 15:47 ` [PATCH 1/4] fsck: return error code when verify_pack() goes wrong Nguyễn Thái Ngọc Duy
2011-11-04 15:47 ` Nguyễn Thái Ngọc Duy [this message]
2011-11-04 15:47 ` [PATCH 3/4] fsck: avoid reading every object twice Nguyễn Thái Ngọc Duy
2011-11-04 15:47 ` [PATCH 4/4] fsck: print progress Nguyễn Thái Ngọc Duy
2011-11-04 20:14 ` Jeff King
2011-11-05 3:26 ` Nguyen Thai Ngoc Duy
2011-11-04 18:43 ` [PATCH 0/4] fsck improvements Junio C Hamano
2011-11-05 3:18 ` Nguyen Thai Ngoc Duy
2011-11-05 5:26 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320421670-518-3-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).