summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-05-02 00:25:56 +0000
committerJunio C Hamano <gitster@pobox.com>2018-05-02 13:59:52 +0900
commitcb91022c0e6d5e926d009156c1aea7dc137ddefd (patch)
tree55e6ac17711be524f1698ac885dd58361b9406ea /commit.c
parentd41836a0b2599d1faa93c60dc67c920045ee1f57 (diff)
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions