Merge branch 'maint'

* maint:
Break down no-lstat() condition checks in verify_uptodate()
t7400: fix bogus test failure with symlinked trash
Documentation: clarify the invalidated tree entry format

diff --cc t/t7400-submodule-basic.sh
Simple merge

diff --cc unpack-trees.c
Simple merge