diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:42:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:42:28 -0800 |
| commit | 58f1d950e373afe35ed8661045914d23e973d067 (patch) | |
| tree | 5cc72572de28cfd1f2e9e6d0b1f6299998f15725 /config.mak.uname | |
| parent | 7fa1365c54c28b3cd9375539f381b54061a1880d (diff) | |
| parent | 9a8c2b67cd5a51666f2c0ce3fbbdb08b97b79b3d (diff) | |
| download | git-58f1d950e373afe35ed8661045914d23e973d067.tar.gz git-58f1d950e373afe35ed8661045914d23e973d067.tar.xz | |
Sync with v2.0.5
* maint-2.0:
Git 2.0.5
Git 1.9.5
Git 1.8.5.6
fsck: complain about NTFS ".git" aliases in trees
read-cache: optionally disallow NTFS .git variants
path: add is_ntfs_dotgit() helper
fsck: complain about HFS+ ".git" aliases in trees
read-cache: optionally disallow HFS+ .git variants
utf8: add is_hfs_dotgit() helper
fsck: notice .git case-insensitively
t1450: refactor ".", "..", and ".git" fsck tests
verify_dotfile(): reject .git case-insensitively
read-tree: add tests for confusing paths like ".." and ".git"
unpack-trees: propagate errors adding entries to the index
Diffstat (limited to 'config.mak.uname')
| -rw-r--r-- | config.mak.uname | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index 15ee15e98..0941e30a6 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -100,6 +100,7 @@ ifeq ($(uname_S),Darwin) HAVE_DEV_TTY = YesPlease COMPAT_OBJS += compat/precompose_utf8.o BASIC_CFLAGS += -DPRECOMPOSE_UNICODE + BASIC_CFLAGS += -DPROTECT_HFS_DEFAULT=1 endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease @@ -368,6 +369,7 @@ 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 @@ -509,6 +511,7 @@ 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 BASIC_LDFLAGS += -Wl,--large-address-aware EXTLIBS += -lws2_32 GITLIBS += git.res |