summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2022-02-05 00:48:29 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-25 17:16:31 -0800
commitee213de22d15e801ba3712be0cb8ecbf7415fa1d (patch)
treec6f0cb0706e64e4d9fe00cb5fda4cd133e743767 /builtin/index-pack.c
parentobject API docs: move check_object_signature() docs to cache.h (diff)
downloadtgif-ee213de22d15e801ba3712be0cb8ecbf7415fa1d.tar.xz
object API users + docs: check <0, not !0 with check_object_signature()
Change those users of the object API that misused check_object_signature() by assuming it returned any non-zero when the OID didn't match the expected value to check <0 instead. In practice all of this code worked before, but it wasn't consistent with rest of the users of the API. Let's also clarify what the <0 return value means in API docs. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r--builtin/index-pack.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 01574378ce..416f60a98c 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1412,9 +1412,8 @@ static void fix_unresolved_deltas(struct hashfile *f)
if (!data)
continue;
- if (check_object_signature(the_repository, &d->oid,
- data, size,
- type_name(type), NULL))
+ if (check_object_signature(the_repository, &d->oid, data, size,
+ type_name(type), NULL) < 0)
die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
/*