From: brian m. carlson Date: Wed, 2 May 2018 00:25:57 +0000 (+0000) Subject: merge: convert empty tree constant to the_hash_algo X-Git-Tag: v2.18.0-rc0~17^2~13 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9fe6f262eab9a262100cbd60355b8c0f346ff59?ds=inline;hp=e9fe6f262eab9a262100cbd60355b8c0f346ff59 merge: convert empty tree constant to the_hash_algo To avoid dependency on a particular hash algorithm, convert a use of EMPTY_TREE_SHA1_HEX to use the_hash_algo->empty_tree instead. Since both branches now use oid_to_hex, condense the if statement into a ternary. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano ---