diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:25:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-02 13:59:52 +0900 |
| commit | cb91022c0e6d5e926d009156c1aea7dc137ddefd (patch) | |
| tree | 55e6ac17711be524f1698ac885dd58361b9406ea /versioncmp.c | |
| parent | builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo (diff) | |
| download | tgif-cb91022c0e6d5e926d009156c1aea7dc137ddefd.tar.xz | |
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 'versioncmp.c')
0 files changed, 0 insertions, 0 deletions