Merge branch 'mz/oneway-merge-wo-u-no-lstat'

Optimize "read-tree -m <tree-ish>" without "-u". * mz/oneway-merge-wo-u-no-lstat: oneway_merge(): only lstat() when told to update worktree