diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 20:17:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 20:17:58 (GMT) |
| commit | 3b7d373ae2618690170f93bd19883915851de903 (patch) | |
| tree | c95dbebc54fc60a920479b96836b3f35e245ae9f /cache.h | |
| parent | 949d16795c55ae4712aaec847d55bd2d7d050c84 (diff) | |
| parent | 3e370f9faf0a4e26d92ae09a26baa19330887903 (diff) | |
| download | git-3b7d373ae2618690170f93bd19883915851de903.zip git-3b7d373ae2618690170f93bd19883915851de903.tar.gz git-3b7d373ae2618690170f93bd19883915851de903.tar.bz2 | |
Merge branch 'kn/cat-file-literally'
Add the "--allow-unknown-type" option to "cat-file" to allow
inspecting loose objects of an experimental or a broken type.
* kn/cat-file-literally:
t1006: add tests for git cat-file --allow-unknown-type
cat-file: teach cat-file a '--allow-unknown-type' option
cat-file: make the options mutually exclusive
sha1_file: support reading from a loose object of unknown type
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -879,6 +879,7 @@ extern char *xdg_config_home(const char *filename); /* object replacement */ #define LOOKUP_REPLACE_OBJECT 1 +#define LOOKUP_UNKNOWN_OBJECT 2 extern void *read_sha1_file_extended(const unsigned char *sha1, enum object_type *type, unsigned long *size, unsigned flag); static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size) { @@ -1351,6 +1352,7 @@ struct object_info { unsigned long *sizep; unsigned long *disk_sizep; unsigned char *delta_base_sha1; + struct strbuf *typename; /* Response */ enum { |