diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:21:21 -0700 |
| commit | 356df9bd8df58eb759fedaee8a8d1a7dc0872f8f (patch) | |
| tree | 3ed41eb0da59c4a6e1b668c3392295ee334f978b /cache.h | |
| parent | 2bf3501150145d1f05678c20ab8e8d66f849851f (diff) | |
| parent | d099b7173dabdeeb1f339151ac2169b3a91bf631 (diff) | |
| download | git-356df9bd8df58eb759fedaee8a8d1a7dc0872f8f.tar.gz | |
Merge branch 'jk/cat-file-batch-optim'
If somebody wants to only know on-disk footprint of an object
without having to know its type or payload size, we can bypass a
lot of code to cheaply learn it.
* jk/cat-file-batch-optim:
Fix some sparse warnings
sha1_object_info_extended: pass object_info to helpers
sha1_object_info_extended: make type calculation optional
packed_object_info: make type lookup optional
packed_object_info: hoist delta type resolution to helper
sha1_loose_object_info: make type lookup optional
sha1_object_info_extended: rename "status" to "type"
cat-file: disable object/refname ambiguity check for batch mode
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -577,6 +577,7 @@ extern int assume_unchanged; extern int prefer_symlink_refs; extern int log_all_ref_updates; extern int warn_ambiguous_refs; +extern int warn_on_object_refname_ambiguity; extern int shared_repository; extern const char *apply_default_whitespace; extern const char *apply_default_ignorewhitespace; @@ -1131,6 +1132,7 @@ extern int unpack_object_header(struct packed_git *, struct pack_window **, off_ struct object_info { /* Request */ + enum object_type *typep; unsigned long *sizep; unsigned long *disk_sizep; |