OSDN Git Service

Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Aug 2013 18:01:00 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Aug 2013 18:01:01 +0000 (11:01 -0700)
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

1  2 
Documentation/config.txt
Makefile
config.mak.uname
contrib/completion/git-completion.bash
git-compat-util.h
path.c

Simple merge
diff --cc Makefile
Simple merge
@@@ -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
Simple merge
diff --cc path.c
Simple merge