Merge branch 'ml/cygwin-updates'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2013 02:22:49 +0000 (19:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2013 02:22:49 +0000 (19:22 -0700)
The tip one does _not_ revert c869753e (Force core.filemode to
false on Cygwin., 2006-12-30) on purpose, so that people can
still retain the old behaviour if they wanted to.

* ml/cygwin-updates:
cygwin: stop forcing core.filemode=false
Cygwin 1.7 supports mmap
Cygwin 1.7 has thread-safe pread
Cygwin 1.7 needs compat/regex

config.mak.uname
index 7ac541e9ebbe77b339846d8efafdd0b6f33fee95..b45b91075966f450e221bb373ab79a311093284d 100644 (file)
@@ -159,16 +159,17 @@ 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