dilim/git
1
0 Fork 0
mirror of https://github.com/git/git.git synced 2026-11-06 05:17:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

odb: don't try re-fetching corrupt objects

Browse Source 
When we failed reading an object in a repository with a promisor remote
we try to fetch it from the promisor and then re-read it. This logic
kicks in not only when the object couldn't be found, but also in the
case where it could be found but the object is corrupt. It feels dubious
though to just paper over corruption and proceed as if nothing has
happened, happily fetching data from the promisor.

Adapt the code so that we only fetch objects in case they are missing.

Suggested-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt authored and Junio C Hamano committed 2026-10-15 07:23:46 -07:00
1 parent c3c9328a10
commit a4511d98e9
1 file changed
+8 -20
Download Patch File Download Diff File Expand all files Collapse all files
odb.c
+8 -20
View File
@@ -265,7 +265,6 @@ static enum odb_read_status do_oid_object_info_extended(struct object_database *
struct strbuf corrupt_err = STRBUF_INIT;
const struct object_id *real = oid;
enum odb_read_status ret;
bool corrupt = false;
if (flags & OBJECT_INFO_LOOKUP_REPLACE)
real = lookup_replace_object(odb->repo, oid);
@@ -278,38 +277,27 @@ static enum odb_read_status do_oid_object_info_extended(struct object_database *
ret = odb_source_read_object_info(odb->source, real, oi, flags,
&corrupt_err);
if (!ret)
goto out;
if (ret != ODB_READ_NOT_FOUND)
corrupt = true;
/* Try to fetch the missing object from a promisor remote. */
if (odb->repo->fetch_if_missing && repo_has_promisor_remote(odb->repo) &&
!(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
if (ret == ODB_READ_NOT_FOUND &&
odb->repo->fetch_if_missing &&
!(flags & OBJECT_INFO_SKIP_FETCH_OBJECT) &&
repo_has_promisor_remote(odb->repo)) {
/* Try to fetch the missing object from a promisor remote. */
promisor_remote_get_direct(odb->repo, real, 1);
ret = odb_source_read_object_info(odb->source, real, oi, flags,
corrupt_err.len ? NULL : &corrupt_err);
if (!ret)
goto out;
if (ret != ODB_READ_NOT_FOUND)
corrupt = true;
&corrupt_err);
}
if (flags & OBJECT_INFO_DIE_IF_CORRUPT) {
if (ret < 0 && (flags & OBJECT_INFO_DIE_IF_CORRUPT)) {
if ((flags & OBJECT_INFO_LOOKUP_REPLACE) && !oideq(real, oid))
die(_("replacement %s not found for %s"),
oid_to_hex(real), oid_to_hex(oid));
if (corrupt) {
if (ret != ODB_READ_NOT_FOUND) {
if (corrupt_err.len)
die("%s", corrupt_err.buf);
die(_("object %s is corrupt"), oid_to_hex(real));
}
}
ret = corrupt ? ODB_READ_ERROR : ODB_READ_NOT_FOUND;
out:
strbuf_release(&corrupt_err);
return ret;
}