From: Junio C Hamano <junkio@cox.net>
Date: Sat, 19 Nov 2005 00:58:51 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v0.99.9k~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52b6536c624b4998b3730b55b9bc3d7c4e1071a4?ds=inline;hp=-c

Merge branch 'master'
---

52b6536c624b4998b3730b55b9bc3d7c4e1071a4
diff --combined Makefile
index 819c48ce8b,d8bb375752..2d8853d69e
--- a/Makefile
+++ b/Makefile
@@@ -50,7 -50,7 +50,7 @@@
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
 -GIT_VERSION = 0.99.9.GIT
 +GIT_VERSION = 0.99.9j
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -208,6 -208,10 +208,10 @@@ endi
  ifeq ($(uname_O),Cygwin)
  	NO_STRCASESTR = YesPlease
  	NEEDS_LIBICONV = YesPlease
+ 	# There are conflicting reports about this.
+ 	# On some boxes NO_MMAP is needed, and not so elsewhere.
+ 	# Try uncommenting this if you see things break -- YMMV.
+ 	# NO_MMAP = YesPlease
  	NO_IPV6 = YesPlease
  	X = .exe
  	ALL_CFLAGS += -DUSE_SYMLINK_HEAD=0