diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-25 16:06:56 -0700 |
| commit | 061a21d36d807bdcf996f388d5e487d5e1993bbc (patch) | |
| tree | 60c0032485577875d1dbbb0a121617c833c374b8 /pack-check.c | |
| parent | The fourteenth batch (diff) | |
| parent | fsck: report invalid object type-path combinations (diff) | |
| download | tgif-061a21d36d807bdcf996f388d5e487d5e1993bbc.tar.xz | |
Merge branch 'ab/fsck-unexpected-type'
"git fsck" has been taught to report mismatch between expected and
actual types of an object better.
* ab/fsck-unexpected-type:
fsck: report invalid object type-path combinations
fsck: don't hard die on invalid object types
object-file.c: stop dying in parse_loose_header()
object-file.c: return ULHR_TOO_LONG on "header too long"
object-file.c: use "enum" return type for unpack_loose_header()
object-file.c: simplify unpack_loose_short_header()
object-file.c: make parse_loose_header_extended() public
object-file.c: return -1, not "status" from unpack_loose_header()
object-file.c: don't set "typep" when returning non-zero
cat-file tests: test for current --allow-unknown-type behavior
cat-file tests: add corrupt loose object test
cat-file tests: test for missing/bogus object with -t, -s and -p
cat-file tests: move bogus_* variable declarations earlier
fsck tests: test for garbage appended to a loose object
fsck tests: test current hash/type mismatch behavior
fsck tests: refactor one test to use a sub-repo
fsck tests: add test for fsck-ing an unknown type
Diffstat (limited to 'pack-check.c')
| -rw-r--r-- | pack-check.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pack-check.c b/pack-check.c index c8e560d71a..3f418e3a6a 100644 --- a/pack-check.c +++ b/pack-check.c @@ -142,7 +142,8 @@ static int verify_packfile(struct repository *r, err = error("cannot unpack %s from %s at offset %"PRIuMAX"", oid_to_hex(&oid), p->pack_name, (uintmax_t)entries[i].offset); - else if (check_object_signature(r, &oid, data, size, type_name(type))) + else if (check_object_signature(r, &oid, data, size, + type_name(type), NULL)) err = error("packed %s from %s is corrupt", oid_to_hex(&oid), p->pack_name); else if (fn) { |