Merge branch 'bc/object-id'
commit6b526ced6fb1808d1b8a9b30010e45dce10a4e7c
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:43 +0000 (29 12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:43 +0000 (29 12:34 +0900)
tree7af6a07af3b20f4313160e77a81b5a26a0b15342
parentf382b756a67e9c9e57fb4d4f07513cc9acd1aae9
parentc251c83df276dc0bff4d008433268ad59b7a8df2
Merge branch 'bc/object-id'

Conversion from uchar[20] to struct object_id continues.

* bc/object-id: (53 commits)
  object: convert parse_object* to take struct object_id
  tree: convert parse_tree_indirect to struct object_id
  sequencer: convert do_recursive_merge to struct object_id
  diff-lib: convert do_diff_cache to struct object_id
  builtin/ls-tree: convert to struct object_id
  merge: convert checkout_fast_forward to struct object_id
  sequencer: convert fast_forward_to to struct object_id
  builtin/ls-files: convert overlay_tree_on_cache to object_id
  builtin/read-tree: convert to struct object_id
  sha1_name: convert internals of peel_onion to object_id
  upload-pack: convert remaining parse_object callers to object_id
  revision: convert remaining parse_object callers to object_id
  revision: rename add_pending_sha1 to add_pending_oid
  http-push: convert process_ls_object and descendants to object_id
  refs/files-backend: convert many internals to struct object_id
  refs: convert struct ref_update to use struct object_id
  ref-filter: convert some static functions to struct object_id
  Convert struct ref_array_item to struct object_id
  Convert the verify_pack callback to struct object_id
  Convert lookup_tag to struct object_id
  ...
48 files changed:
branch.c
builtin/am.c
builtin/blame.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/fsck.c
builtin/grep.c
builtin/log.c
builtin/ls-files.c
builtin/merge-base.c
builtin/name-rev.c
builtin/pack-objects.c
builtin/prune.c
builtin/receive-pack.c
builtin/reflog.c
builtin/reset.c
builtin/rev-list.c
builtin/rev-parse.c
builtin/show-branch.c
builtin/tag.c
bundle.c
cache-tree.c
cache.h
commit.c
commit.h
diff.c
fetch-pack.c
fsck.c
http-backend.c
parse-options-cb.c
pretty.c
reachable.c
ref-filter.c
reflog-walk.c
refs.c
refs.h
refs/files-backend.c
refs/refs-internal.h
revision.c
revision.h
sequencer.c
sha1_name.c
submodule.c
tag.c
tag.h
upload-pack.c
wt-status.c