Merge branch 'bc/object-id' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Mar 2017 22:37:29 +0000 (15:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Mar 2017 22:37:29 +0000 (15:37 -0700)
commit0b3ec5a05ea274b3949f7787146cd814e18b5e7b
tree98efd591ec70762cfa2a977fc62d02c13db58751
parent23dc2f6d3cd0230fcc0aabcb98a39cbef9ded585
parente86ab2c1cd60ec4b9214e5cd8450a474fa175f5c
Merge branch 'bc/object-id' into next

"uchar [40]" to "struct object_id" conversion continues.

* bc/object-id:
  wt-status: convert to struct object_id
  builtin/merge-base: convert to struct object_id
  Convert object iteration callbacks to struct object_id
  sha1_file: introduce an nth_packed_object_oid function
  refs: simplify parsing of reflog entries
  refs: convert each_reflog_ent_fn to struct object_id
  reflog-walk: convert struct reflog_info to struct object_id
  builtin/replace: convert to struct object_id
  Convert remaining callers of resolve_refdup to object_id
  builtin/merge: convert to struct object_id
  builtin/clone: convert to struct object_id
  builtin/branch: convert to struct object_id
  builtin/grep: convert to struct object_id
  builtin/fmt-merge-message: convert to struct object_id
  builtin/fast-export: convert to struct object_id
  builtin/describe: convert to struct object_id
  builtin/diff-tree: convert to struct object_id
  builtin/commit: convert to struct object_id
  hex: introduce parse_oid_hex
18 files changed:
builtin/branch.c
builtin/describe.c
builtin/diff-tree.c
builtin/grep.c
builtin/merge.c
builtin/notes.c
builtin/pack-objects.c
builtin/receive-pack.c
builtin/replace.c
cache.h
ref-filter.c
refs.c
refs.h
refs/files-backend.c
revision.c
sha1_file.c
sha1_name.c
transport.c