]> git.ipfire.org Git - thirdparty/git.git/commit - refs.c
Merge branch 'bc/object-id'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Dec 2015 20:36:13 +0000 (12:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Dec 2015 20:36:13 +0000 (12:36 -0800)
commit844a9ce47208de173341525c15a4c8c689dd278e
treed771915b28609179ddf1f3f911bcb30b7019d7cf
parentb12a966eff3f66337f83c117dbab8fa0cca16e4b
parentfcd30b138759a2ab5ecb55758c3341f0d608df2b
Merge branch 'bc/object-id'

More transition from "unsigned char[40]" to "struct object_id".

This needed a few merge fixups, but is mostly disentangled from other
topics.

* bc/object-id:
  remote: convert functions to struct object_id
  Remove get_object_hash.
  Convert struct object to object_id
  Add several uses of get_object_hash.
  object: introduce get_object_hash macro.
  ref_newer: convert to use struct object_id
  push_refs_with_export: convert to struct object_id
  get_remote_heads: convert to struct object_id
  parse_fetch: convert to use struct object_id
  add_sought_entry_mem: convert to struct object_id
  Convert struct ref to use object_id.
  sha1_file: introduce has_object_file helper.
builtin/blame.c
builtin/commit.c
builtin/grep.c
cache.h
fsck.c
http.c
refs.c
transport.c
wt-status.c