Merge branch 'bc/object-id'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:47:19 +0000 (13:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:47:19 +0000 (13:47 -0700)
commit4af9a7d344b0e1c3b504c0cfb650dabdb1df1852
tree243319fc09235a1e046ea94f40f7837ed9f02ea2
parent4322f3848a224843a2df81055f07899ce1a1b388
parent3a5d7c55f76681ad9dcef8564275217881c9ace0
Merge branch 'bc/object-id'

The "unsigned char sha1[20]" to "struct object_id" conversion
continues.  Notable changes in this round includes that ce->sha1,
i.e. the object name recorded in the cache_entry, turns into an
object_id.

It had merge conflicts with a few topics in flight (Christian's
"apply.c split", Dscho's "cat-file --filters" and Jeff Hostetler's
"status --porcelain-v2").  Extra sets of eyes double-checking for
mismerges are highly appreciated.

* bc/object-id:
  builtin/reset: convert to use struct object_id
  builtin/commit-tree: convert to struct object_id
  builtin/am: convert to struct object_id
  refs: add an update_ref_oid function.
  sha1_name: convert get_sha1_mb to struct object_id
  builtin/update-index: convert file to struct object_id
  notes: convert init_notes to use struct object_id
  builtin/rm: convert to use struct object_id
  builtin/blame: convert file to use struct object_id
  Convert read_mmblob to take struct object_id.
  notes-merge: convert struct notes_merge_pair to struct object_id
  builtin/checkout: convert some static functions to struct object_id
  streaming: make stream_blob_to_fd take struct object_id
  builtin: convert textconv_object to use struct object_id
  builtin/cat-file: convert some static functions to struct object_id
  builtin/cat-file: convert struct expand_data to use struct object_id
  builtin/log: convert some static functions to use struct object_id
  builtin/blame: convert struct origin to use struct object_id
  builtin/apply: convert static functions to struct object_id
  cache: convert struct cache_entry to use struct object_id
apply.c
builtin/am.c
builtin/cat-file.c
builtin/log.c
builtin/submodule--helper.c
cache.h
diff.c
refs.c
refs.h
unpack-trees.c
wt-status.c