From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 13 Jun 2009 19:50:42 +0000 (-0700)
Subject: Merge branch 'sp/msysgit'
X-Git-Tag: v1.6.4-rc0~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ad2a65fbb9b7f26669fed9906fe9a1a531810b;p=git.git

Merge branch 'sp/msysgit'

* sp/msysgit:
  compat/ has subdirectories: do not omit them in 'make clean'
  Fix typo in nedmalloc warning fix
  MinGW: Teach Makefile to detect msysgit and apply specific settings
  Fix warnings in nedmalloc when compiling with GCC 4.4.0
  Add custom memory allocator to MinGW and MacOS builds
  MinGW readdir reimplementation to support d_type
  connect.c: Support PuTTY plink and TortoisePlink as SSH on Windows
  git: browsing paths with spaces when using the start command
  MinGW: fix warning about implicit declaration of _getch()
  test-chmtime: work around Windows limitation
  Work around a regression in Windows 7, causing erase_in_line() to crash sometimes
  Quiet make: do not leave Windows behind
  MinGW: GCC >= 4 does not need SNPRINTF_SIZE_CORR anymore

Conflicts:
	Makefile
---

95ad2a65fbb9b7f26669fed9906fe9a1a531810b
diff --cc Makefile
index 735ab079c,867438de9..41ab8e9e0
--- a/Makefile
+++ b/Makefile
@@@ -856,8 -825,6 +859,7 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	pathsep = ;
  	NO_PREAD = YesPlease
  	NO_OPENSSL = YesPlease
- 	NO_CURL = YesPlease
 +	NO_LIBGEN_H = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
  	NO_IPV6 = YesPlease
  	NO_SETENV = YesPlease