From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Sep 2008 20:56:20 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~248
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b281eea75f0ab68e3c9510323c73b78cd3e62814;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes for 1.6.0.2
  Use compatibility regex library for OSX/Darwin
  git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl
  Git.pm: Use File::Temp->tempfile instead of ->new
  t7501: always use test_cmp instead of diff

Conflicts:
	Makefile
---

b281eea75f0ab68e3c9510323c73b78cd3e62814
diff --cc Makefile
index f4c31c871,a8b3f9e3c..cf320cd0b
--- a/Makefile
+++ b/Makefile
@@@ -762,11 -752,10 +764,11 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_SVN_TESTS = YesPlease
  	NO_PERL_MAKEMAKER = YesPlease
  	NO_POSIX_ONLY_PROGRAMS = YesPlease
 +	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
- 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat
+ 	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/regex -Icompat/fnmatch
  	COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
- 	COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/regex.o compat/winansi.o
+ 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/regex/regex.o compat/winansi.o
  	EXTLIBS += -lws2_32
  	X = .exe
  	gitexecdir = ../libexec/git-core