diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-04-09 23:25:45 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-09 23:25:45 (GMT) |
commit | a5bbc29994b22ab0b57c4dc9568a261d32476e94 (patch) | |
tree | 4cf0247ad3bac3f8130f83a2f9b40197a24fab0f /strbuf.h | |
parent | 78c20b8fcaf0c46942a8c91e38076358f9a948ac (diff) | |
parent | 1a750441a7360b29fff7a414649ece1d35acaca6 (diff) | |
download | git-a5bbc29994b22ab0b57c4dc9568a261d32476e94.zip git-a5bbc29994b22ab0b57c4dc9568a261d32476e94.tar.gz git-a5bbc29994b22ab0b57c4dc9568a261d32476e94.tar.bz2 |
Merge branch 'bc/object-id'
Conversion from uchar[20] to struct object_id continues.
* bc/object-id: (36 commits)
convert: convert to struct object_id
sha1_file: introduce a constant for max header length
Convert lookup_replace_object to struct object_id
sha1_file: convert read_sha1_file to struct object_id
sha1_file: convert read_object_with_reference to object_id
tree-walk: convert tree entry functions to object_id
streaming: convert istream internals to struct object_id
tree-walk: convert get_tree_entry_follow_symlinks internals to object_id
builtin/notes: convert static functions to object_id
builtin/fmt-merge-msg: convert remaining code to object_id
sha1_file: convert sha1_object_info* to object_id
Convert remaining callers of sha1_object_info_extended to object_id
packfile: convert unpack_entry to struct object_id
sha1_file: convert retry_bad_packed_offset to struct object_id
sha1_file: convert assert_sha1_type to object_id
builtin/mktree: convert to struct object_id
streaming: convert open_istream to use struct object_id
sha1_file: convert check_sha1_signature to struct object_id
sha1_file: convert read_loose_object to use struct object_id
builtin/index-pack: convert struct ref_delta_entry to object_id
...
Diffstat (limited to 'strbuf.h')
-rw-r--r-- | strbuf.h | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -72,6 +72,12 @@ struct strbuf { extern char strbuf_slopbuf[]; #define STRBUF_INIT { .alloc = 0, .len = 0, .buf = strbuf_slopbuf } +/* + * Predeclare this here, since cache.h includes this file before it defines the + * struct. + */ +struct object_id; + /** * Life Cycle Functions * -------------------- @@ -558,7 +564,7 @@ extern void strbuf_list_free(struct strbuf **); * the strbuf `sb`. */ extern void strbuf_add_unique_abbrev(struct strbuf *sb, - const unsigned char *sha1, + const struct object_id *oid, int abbrev_len); /** |