diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-27 13:59:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-27 13:59:08 -0700 |
| commit | 17d9dbd3c270aaa33487f6a03d128c47aea6b309 (patch) | |
| tree | 6db3c18e3e2c5ba09abbc87ea85a064a6e3cddf2 /object-store.h | |
| parent | b6fa7fbcd1b6791675c0b36636745e467419a522 (diff) | |
| parent | 141f8c8c0535004fa5432d9a6d57bf08129a7dd8 (diff) | |
| download | git-17d9dbd3c270aaa33487f6a03d128c47aea6b309.tar.xz | |
Merge branch 'jk/no-funny-object-types'
Support to create a loose object file with unknown object type has
been dropped.
* jk/no-funny-object-types:
object-file: drop support for writing objects with unknown types
hash-object: handle --literally with OPT_NEGBIT
hash-object: merge HASH_* and INDEX_* flags
hash-object: stop allowing unknown types
t: add lib-loose.sh
t/helper: add zlib test-tool
oid_object_info(): drop type_name strbuf
fsck: stop using object_info->type_name strbuf
oid_object_info_convert(): stop using string for object type
cat-file: use type enum instead of buffer for -t option
object-file: drop OBJECT_INFO_ALLOW_UNKNOWN_TYPE flag
cat-file: make --allow-unknown-type a noop
object-file.h: fix typo in variable declaration
Diffstat (limited to 'object-store.h')
| -rw-r--r-- | object-store.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/object-store.h b/object-store.h index 141b801113..c589008535 100644 --- a/object-store.h +++ b/object-store.h @@ -206,7 +206,6 @@ struct object_info { unsigned long *sizep; off_t *disk_sizep; struct object_id *delta_base_oid; - struct strbuf *type_name; void **contentp; /* Response */ @@ -241,8 +240,6 @@ struct object_info { /* Invoke lookup_replace_object() on the given hash */ #define OBJECT_INFO_LOOKUP_REPLACE 1 -/* Allow reading from a loose object file of unknown/bogus type */ -#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2 /* Do not retry packed storage after checking packed and loose storage */ #define OBJECT_INFO_QUICK 8 /* |