Merge branch 'bc/object-id'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2018 23:25:45 +0000 (08:25 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2018 23:25:45 +0000 (08:25 +0900)
commita5bbc29994b22ab0b57c4dc9568a261d32476e94
tree4cf0247ad3bac3f8130f83a2f9b40197a24fab0f
parent78c20b8fcaf0c46942a8c91e38076358f9a948ac
parent1a750441a7360b29fff7a414649ece1d35acaca6
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
  ...
26 files changed:
apply.c
builtin/branch.c
builtin/checkout.c
builtin/fetch.c
builtin/grep.c
builtin/index-pack.c
builtin/merge.c
builtin/notes.c
builtin/pack-objects.c
builtin/reflog.c
builtin/replace.c
builtin/rev-list.c
builtin/rm.c
builtin/tag.c
builtin/unpack-objects.c
builtin/worktree.c
cache.h
diff.c
fast-import.c
merge-recursive.c
read-cache.c
rerere.c
sequencer.c
sha1_file.c
strbuf.c
strbuf.h