Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 01:57:32 +0000 (18:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 01:57:32 +0000 (18:57 -0700)
* 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

1  2 
t/t7400-submodule-basic.sh
unpack-trees.c

Simple merge
diff --cc unpack-trees.c
Simple merge