diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:09:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:09:27 -0700 |
| commit | 55ac692661f7b850bb0160de18fa9868d24dbe17 (patch) | |
| tree | 61559a2f9a0964462b948c4dc70d11eeeb7d0e5c /builtin | |
| parent | 61f44720a9c360dd30053a558e58c8a41d6f3843 (diff) | |
| parent | 23c7df6bdd13e3d99ca09b6a7655747cc29ccc41 (diff) | |
| download | git-55ac692661f7b850bb0160de18fa9868d24dbe17.tar.gz | |
Merge branch 'jc/streaming' into next
* jc/streaming:
sha1_file: use the correct type (ssize_t, not size_t) for read-style function
streaming: read loose objects incrementally
sha1_file.c: expose helpers to read loose objects
streaming: read non-delta incrementally from a pack
streaming_write_entry(): support files with holes
convert: CRLF_INPUT is a no-op in the output codepath
streaming_write_entry(): use streaming API in write_entry()
streaming: a new API to read from the object store
write_entry(): separate two helper functions out
unpack_object_header(): make it public
sha1_object_info_extended(): hint about objects in delta-base cache
sha1_object_info_extended(): expose a bit more info
packed_object_info_detail(): do not return a string
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/verify-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index b6079ae6cb..3a919b1707 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -33,9 +33,9 @@ static void show_pack_info(struct packed_git *p, unsigned int flags) if (!sha1) die("internal error pack-check nth-packed-object"); offset = nth_packed_object_offset(p, i); - type = packed_object_info_detail(p, offset, &size, &store_size, + type = typename(packed_object_info_detail(p, offset, &size, &store_size, &delta_chain_length, - base_sha1); + base_sha1)); if (!stat_only) printf("%s ", sha1_to_hex(sha1)); if (!delta_chain_length) { |