diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 20:38:25 (GMT) |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 15:27:18 (GMT) |
| commit | 9ac92fed5b63176e653c3c42e2b66cdd203c906f (patch) | |
| tree | a1733918e274272dc9aecb371717c52a071254c0 /config.mak.uname | |
| parent | 27d05d1a1a62273aa3749f4d0ab8a126ef11ff66 (diff) | |
| parent | 7cdafcaacf677b9e0700fa988c247bda192db48d (diff) | |
| download | git-9ac92fed5b63176e653c3c42e2b66cdd203c906f.zip git-9ac92fed5b63176e653c3c42e2b66cdd203c906f.tar.gz git-9ac92fed5b63176e653c3c42e2b66cdd203c906f.tar.bz2 | |
Sync with 2.15.4
* maint-2.15: (29 commits)
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
path: safeguard `.git` against NTFS Alternate Streams Accesses
clone --recurse-submodules: prevent name squatting on Windows
is_ntfs_dotgit(): only verify the leading segment
...
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 6a1d0de..d3524c5 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -380,7 +380,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 @@ -518,7 +517,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 = |