From: Junio C Hamano Date: Fri, 2 Aug 2013 18:01:00 +0000 (-0700) Subject: Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat' X-Git-Tag: v1.8.4-rc2~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d6cbf2fa7a51229d992c9c8d51eb635eccdd6067?ds=inline;hp=--cc Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat' Cygwin port added a "not quite correct but a lot faster and good enough for many lstat() calls that are only used to see if the working tree entity matches the index entry" lstat() emulation some time ago, and it started biting us in places. This removes it and uses the standard lstat() that comes with Cygwin. Recent topic that uses lstat on packed-refs file is broken when this cheating lstat is used, and this is a simplest fix that is also the cleanest direction to go in the long run. * rj/cygwin-clarify-use-of-cheating-lstat: cygwin: Remove the Win32 l/stat() implementation --- d6cbf2fa7a51229d992c9c8d51eb635eccdd6067 diff --cc config.mak.uname index b45b910759,1666551f61..b27f51d486 --- a/config.mak.uname +++ b/config.mak.uname @@@ -159,19 -159,17 +159,18 @@@ ifeq ($(uname_O),Cygwin NO_SYMLINK_HEAD = YesPlease NO_IPV6 = YesPlease OLD_ICONV = UnfortunatelyYes + NO_THREAD_SAFE_PREAD = YesPlease + # There are conflicting reports about this. + # On some boxes NO_MMAP is needed, and not so elsewhere. + # Try commenting this out if you suspect MMAP is more efficient + NO_MMAP = YesPlease + else + NO_REGEX = UnfortunatelyYes endif - NO_THREAD_SAFE_PREAD = YesPlease NEEDS_LIBICONV = YesPlease NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes - NO_TRUSTABLE_FILEMODE = UnfortunatelyYes NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease - # There are conflicting reports about this. - # On some boxes NO_MMAP is needed, and not so elsewhere. - # Try commenting this out if you suspect MMAP is more efficient - NO_MMAP = YesPlease X = .exe - COMPAT_OBJS += compat/cygwin.o UNRELIABLE_FSTAT = UnfortunatelyYes SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield endif