summaryrefslogtreecommitdiff
path: root/mergetools/emerge
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-06-20 03:41:17 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-20 10:19:37 -0700
commit46931d39389f2886e6c159674923345f024e1c64 (patch)
treea72422ed1865233450d9ddc4eb5876799bba0613 /mergetools/emerge
parentobject: convert lookup_object() to use object_id (diff)
downloadtgif-46931d39389f2886e6c159674923345f024e1c64.tar.xz
object: convert internal hash_obj() to object_id
Now that lookup_object() has an object_id, we can consistently pass that around instead of a raw sha1. We still convert to a hash to pass to sha1hash(), but the goal is for that to go away shortly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions