Merge branch 'maint'
commitb35acb53458d0f99ba2400b902980b35e5acc2d3
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 01:57:32 +0000 (31 18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 01:57:32 +0000 (31 18:57 -0700)
tree2e599a9af18af3b62ce52318b2759faa7d92f311
parent4db0d0d1ba94c08f9476c7adff61375a752b154d
parentd5b66299040969706dd675c021f4336a26a6cc82
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
t/t7400-submodule-basic.sh
unpack-trees.c