Merge branch 'tl/ls-tree-oid-only'