Merge branch 'nd/fbsd-lazy-mtime' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:30 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:30 +0000 (11:55 -0700)
commitf7fb6e21b8f392f97fd35da41a31078fe6641b2a
treeadf2537def860c0cd83d2d1958e0a6f78cd3541f
parent1dc4aa67d615afa1f3fc0b19a873a68ba6ab3da8
parent6b7728db811142a8dba5d330da70d7c4b43d9acd
Merge branch 'nd/fbsd-lazy-mtime' into maint

FreeBSD can lie when asked mtime of a directory, which made the
untracked cache code to fall back to a slow-path, which in turn
caused tests in t7063 to fail because it wanted to verify the
behaviour of the fast-path.

* nd/fbsd-lazy-mtime:
  t7063: work around FreeBSD's lazy mtime update feature
t/t7063-status-untracked-cache.sh