Merge branch 'bc/object-id' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:38:24 +0000 (23:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Apr 2017 06:38:25 +0000 (23:38 -0700)
commitb16f1899dd158d203f9714e7fa9e41e5e4265198
tree8efd0b8435bd9ee4ea52bde965bd100d7d9744ff
parent24e18f4a4a14f74884eeb1cd94f45f39ddf07e37
parente239dabb1465d3ff927840b4fff15150a2170b4e
Merge branch 'bc/object-id' into next

Conversion from unsigned char [40] to struct object_id continues.

* bc/object-id:
  Documentation: update and rename api-sha1-array.txt
  Rename sha1_array to oid_array
  Convert sha1_array_for_each_unique and for_each_abbrev to object_id
  Convert sha1_array_lookup to take struct object_id
  Convert remaining callers of sha1_array_lookup to object_id
  Make sha1_array_append take a struct object_id *
  sha1-array: convert internal storage for struct sha1_array to object_id
  builtin/pull: convert to struct object_id
  submodule: convert check_for_new_submodule_commits to object_id
  sha1_name: convert disambiguate_hint_fn to take object_id
  sha1_name: convert struct disambiguate_state to object_id
  test-sha1-array: convert most code to struct object_id
  parse-options-cb: convert sha1_array_append caller to struct object_id
  fsck: convert init_skiplist to struct object_id
  builtin/receive-pack: convert portions to struct object_id
  builtin/pull: convert portions to struct object_id
  builtin/diff: convert to struct object_id
  Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ
  Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ
  Define new hash-size constants for allocating memory
19 files changed:
bisect.c
builtin/fetch.c
builtin/merge.c
builtin/pack-objects.c
builtin/receive-pack.c
builtin/rev-parse.c
builtin/send-pack.c
cache.h
combine-diff.c
diff.c
ref-filter.c
ref-filter.h
remote-curl.c
remote.h
send-pack.c
sha1_file.c
sha1_name.c
submodule.c
submodule.h