diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-05 00:21:20 +0300 |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 18:29:15 +0300 |
commit | 14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2 (patch) | |
tree | d8127060ce208c40c4f5dd67a412171154e362c6 /config.mak.uname | |
parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff) | |
parent | a5ab8d03173458b76b8452efd90a7173f490c132 (diff) |
Sync with 2.17.3
* maint-2.17: (32 commits)
Git 2.17.3
Git 2.16.6
test-drop-caches: use `has_dos_drive_prefix()`
Git 2.15.4
Git 2.14.6
mingw: handle `subst`-ed "DOS drives"
mingw: refuse to access paths with trailing spaces or periods
mingw: refuse to access paths with illegal characters
unpack-trees: let merged_entry() pass through do_add_entry()'s errors
quote-stress-test: offer to test quoting arguments for MSYS2 sh
t6130/t9350: prepare for stringent Win32 path validation
quote-stress-test: allow skipping some trials
quote-stress-test: accept arguments to test via the command-line
tests: add a helper to stress test argument quoting
mingw: fix quoting of arguments
Disallow dubiously-nested submodule git directories
protect_ntfs: turn on NTFS protection by default
path: also guard `.gitmodules` against NTFS Alternate Data Streams
is_ntfs_dotgit(): speed it up
mingw: disallow backslash characters in tree objects' file names
...
Diffstat (limited to 'config.mak.uname')
-rw-r--r-- | config.mak.uname | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config.mak.uname b/config.mak.uname index 684fc5bf02..c3f2c0fc17 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -389,7 +389,6 @@ ifeq ($(uname_S),Windows) EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj PTHREAD_LIBS = lib = - BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1 ifndef DEBUG BASIC_CFLAGS += -GL -Os -MD BASIC_LDFLAGS += -LTCG @@ -528,7 +527,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) COMPAT_OBJS += compat/mingw.o compat/winansi.o \ compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o - BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1 EXTLIBS += -lws2_32 GITLIBS += git.res PTHREAD_LIBS = |