Merge branch 'po/object-id'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 22:55:43 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 22:55:43 +0000 (14:55 -0800)
commit8be8342b4c47df386c6eced39922595d7dfdccc9
tree3fed16dd1602125435cf12a4c150698bb13bdf59
parent157ee050615192d579a358723563e7f785d676ff
parent1752cbbc447c08230c478239e185db9fa2d4a515
Merge branch 'po/object-id'

Conversion from uchar[20] to struct object_id continues.

* po/object-id:
  sha1_file: rename hash_sha1_file_literally
  sha1_file: convert write_loose_object to object_id
  sha1_file: convert force_object_loose to object_id
  sha1_file: convert write_sha1_file to object_id
  notes: convert write_notes_tree to object_id
  notes: convert combine_notes_* to object_id
  commit: convert commit_tree* to object_id
  match-trees: convert splice_tree to object_id
  cache: clear whole hash buffer with oidclr
  sha1_file: convert hash_sha1_file to object_id
  dir: convert struct sha1_stat to use object_id
  sha1_file: convert pretend_sha1_file to object_id
15 files changed:
apply.c
builtin/am.c
builtin/commit.c
builtin/index-pack.c
builtin/pack-objects.c
cache-tree.c
cache.h
commit.c
convert.c
diffcore-rename.c
dir.c
merge-recursive.c
read-cache.c
sequencer.c
sha1_file.c