Merge branch 'bc/object-id'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:26:55 +0000 (13:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Aug 2017 20:26:55 +0000 (13:26 -0700)
Conversion from uchar[20] to struct object_id continues.

* bc/object-id:
sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ
sha1_name: convert GET_SHA1* flags to GET_OID*
sha1_name: convert get_sha1* to get_oid*
Convert remaining callers of get_sha1 to get_oid.
builtin/unpack-file: convert to struct object_id
bisect: convert bisect_checkout to struct object_id
builtin/update_ref: convert to struct object_id
sequencer: convert to struct object_id
remote: convert struct push_cas to struct object_id
submodule: convert submodule config lookup to use object_id
builtin/merge-tree: convert remaining caller of get_sha1 to object_id
builtin/fsck: convert remaining caller of get_sha1 to object_id

1  2 
builtin/grep.c
cache.h
config.c
refs.c
remote.c
revision.c
submodule-config.c
submodule-config.h
submodule.c
submodule.h
diff --cc builtin/grep.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc revision.c
Simple merge
Simple merge
Simple merge
diff --cc submodule.c
Simple merge
diff --cc submodule.h
Simple merge