builtin/merge: switch tree functions to use object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Wed, 2 May 2018 00:25:56 +0000 (00:25 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 May 2018 04:59:52 +0000 (13:59 +0900)
commitcb91022c0e6d5e926d009156c1aea7dc137ddefd
tree55e6ac17711be524f1698ac885dd58361b9406ea
parentd41836a0b2599d1faa93c60dc67c920045ee1f57
builtin/merge: switch tree functions to use object_id

The read_empty and reset_hard functions are static and their callers
have already changed to use struct object_id, so convert them as well.
To avoid dependency on the hash algorithm in use, switch from using
EMPTY_TREE_SHA1_HEX to using empty_tree_oid_hex.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c