From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH v2 4/5] packfile: convert has_packed_and_bad() to object_id
Date: Sat, 11 Sep 2021 22:42:20 +0200 [thread overview]
Message-ID: <dcf75a98-8659-2df0-9d6d-4015aec81c6c@web.de> (raw)
In-Reply-To: <e50c1465-59de-7fe1-de01-800404c7640e@web.de>
The single caller has a full object ID, so pass it on instead of just
its hash member.
Signed-off-by: René Scharfe <l.s.r@web.de>
---
object-file.c | 2 +-
packfile.c | 4 ++--
packfile.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/object-file.c b/object-file.c
index fb5a385a06..01e7058b4e 100644
--- a/object-file.c
+++ b/object-file.c
@@ -1725,7 +1725,7 @@ void *read_object_file_extended(struct repository *r,
die(_("loose object %s (stored in %s) is corrupt"),
oid_to_hex(repl), path);
- if ((p = has_packed_and_bad(r, repl->hash)) != NULL)
+ if ((p = has_packed_and_bad(r, repl)) != NULL)
die(_("packed object %s (stored in %s) is corrupt"),
oid_to_hex(repl), p->pack_name);
obj_read_unlock();
diff --git a/packfile.c b/packfile.c
index fb15fc5b49..04080a558b 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1176,14 +1176,14 @@ void mark_bad_packed_object(struct packed_git *p, const struct object_id *oid)
}
const struct packed_git *has_packed_and_bad(struct repository *r,
- const unsigned char *sha1)
+ const struct object_id *oid)
{
struct packed_git *p;
unsigned i;
for (p = r->objects->packed_git; p; p = p->next)
for (i = 0; i < p->num_bad_objects; i++)
- if (hasheq(sha1,
+ if (hasheq(oid->hash,
p->bad_object_sha1 + the_hash_algo->rawsz * i))
return p;
return NULL;
diff --git a/packfile.h b/packfile.h
index a982ed9994..186146779d 100644
--- a/packfile.h
+++ b/packfile.h
@@ -160,7 +160,7 @@ int packed_object_info(struct repository *r,
off_t offset, struct object_info *);
void mark_bad_packed_object(struct packed_git *, const struct object_id *);
-const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
+const struct packed_git *has_packed_and_bad(struct repository *, const struct object_id *);
#define ON_DISK_KEEP_PACKS 1
#define IN_CORE_KEEP_PACKS 2
--
2.33.0
next prev parent reply other threads:[~2021-09-11 20:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-11 7:50 [PATCH 0/3] packfile: use oidset for bad objects René Scharfe
2021-09-11 7:59 ` [PATCH 1/3] packfile: convert mark_bad_packed_object() to object_id René Scharfe
2021-09-11 8:00 ` [PATCH 2/3] packfile: convert has_packed_and_bad() " René Scharfe
2021-09-11 8:01 ` [PATCH 3/3] packfile: use oidset for bad objects René Scharfe
2021-09-11 14:26 ` Jeff King
2021-09-11 16:08 ` René Scharfe
2021-09-11 17:03 ` Jeff King
2021-09-11 17:16 ` René Scharfe
2021-09-11 14:27 ` [PATCH 0/3] " Jeff King
2021-09-11 16:08 ` [PATCH 4/3] midx: inline nth_midxed_pack_entry() René Scharfe
2021-09-11 17:03 ` René Scharfe
2021-09-11 17:07 ` Jeff King
2021-09-11 20:31 ` René Scharfe
2021-09-11 21:20 ` Jeff King
2021-09-11 23:39 ` René Scharfe
2021-09-11 20:31 ` [PATCH v2 0/5] packfile: use oidset for bad objects René Scharfe
2021-09-11 20:36 ` [PATCH 1/5] oidset: make oidset_size() an inline function René Scharfe
2021-09-11 20:39 ` [PATCH 2/5] midx: inline nth_midxed_pack_entry() René Scharfe
2021-09-11 20:40 ` [PATCH 3/5] packfile: convert mark_bad_packed_object() to object_id René Scharfe
2021-09-11 20:42 ` René Scharfe [this message]
2021-09-11 20:43 ` [PATCH v2 5/5] packfile: use oidset for bad objects René Scharfe
2021-09-11 20:45 ` [PATCH v2 0/5] " René Scharfe
2021-09-11 21:22 ` Jeff King
2021-09-11 23:59 ` Derrick Stolee
2021-09-12 1:51 ` Taylor Blau
2021-09-12 2:29 ` Taylor Blau
2021-09-12 3:51 ` Derrick Stolee
2021-09-12 4:01 ` Taylor Blau
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=dcf75a98-8659-2df0-9d6d-4015aec81c6c@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).