From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2014 18:59:05 +0000 (-0700)
Subject: Merge branch 'jk/commit-dates-parsing-fix'
X-Git-Tag: v2.0.0-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bdb830c44567ebbdec497e6af21b87d4e43539cc?hp=-c

Merge branch 'jk/commit-dates-parsing-fix'

Finishing touches for portability.

* jk/commit-dates-parsing-fix:
t4212: loosen far-in-future test for AIX
date: recognize bogus FreeBSD gmtime output
---

bdb830c44567ebbdec497e6af21b87d4e43539cc
diff --combined Makefile
index c5316a34ac,da7013b1bc..f49f187516
--- a/Makefile
+++ b/Makefile
@@@ -59,9 -59,9 +59,9 @@@ all:
  # FreeBSD can use either, but MinGW and some others need to use
  # libcharset.h's locale_charset() instead.
  #
 -# Define CHARSET_LIB to you need to link with library other than -liconv to
 +# Define CHARSET_LIB to the library you need to link with in order to
  # use locale_charset() function.  On some platforms this needs to set to
 -# -lcharset
 +# -lcharset, on others to -liconv .
  #
  # Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't
  # need -lintl when linking.
@@@ -101,6 -101,14 +101,6 @@@
  #
  # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
  #
 -# Define NO_FNMATCH if you don't have fnmatch in the C library.
 -#
 -# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
 -# FNM_CASEFOLD GNU extension.
 -#
 -# Define USE_WILDMATCH if you want to use Git's wildmatch
 -# implementation as fnmatch
 -#
  # Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd
  # in the C library.
  #
@@@ -129,10 -137,6 +129,10 @@@
  # specify your own (or DarwinPort's) include directories and
  # library directories by defining CFLAGS and LDFLAGS appropriately.
  #
 +# Define NO_APPLE_COMMON_CRYPTO if you are building on Darwin/Mac OS X
 +# and do not want to use Apple's CommonCrypto library.  This allows you
 +# to provide your own OpenSSL library, for example from MacPorts.
 +#
  # Define BLK_SHA1 environment variable to make use of the bundled
  # optimized C SHA1 routine.
  #
@@@ -286,6 -290,10 +286,6 @@@
  #
  # Define NO_REGEX if you have no or inferior regex support in your C library.
  #
 -# Define CYGWIN_V15_WIN32API if you are using Cygwin v1.7.x but are not
 -# using the current w32api packages. The recommended approach, however,
 -# is to update your installation if compilation errors occur.
 -#
  # Define HAVE_DEV_TTY if your system can open /dev/tty to interact with the
  # user.
  #
@@@ -335,9 -343,8 +335,12 @@@
  # (defaults to "man") if you want to have a different default when
  # "git help" is called without a parameter specifying the format.
  #
 +# Define TEST_GIT_INDEX_VERSION to 2, 3 or 4 to run the test suite
 +# with a different indexfile format version.  If it isn't set the index
 +# file format used is index-v[23].
++#
+ # Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
+ # return NULL when it receives a bogus time_t.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -354,39 -361,33 +357,39 @@@ STRIP ?= stri
  # Among the variables below, these:
  #   gitexecdir
  #   template_dir
 -#   mandir
 -#   infodir
 -#   htmldir
  #   sysconfdir
  # can be specified as a relative path some/where/else;
  # this is interpreted as relative to $(prefix) and "git" at
  # runtime figures out where they are based on the path to the executable.
 +# Additionally, the following will be treated as relative by "git" if they
 +# begin with "$(prefix)/":
 +#   mandir
 +#   infodir
 +#   htmldir
  # This can help installing the suite in a relocatable way.
  
  prefix = $(HOME)
  bindir_relative = bin
  bindir = $(prefix)/$(bindir_relative)
 -mandir = share/man
 -infodir = share/info
 +mandir = $(prefix)/share/man
 +infodir = $(prefix)/share/info
  gitexecdir = libexec/git-core
  mergetoolsdir = $(gitexecdir)/mergetools
  sharedir = $(prefix)/share
  gitwebdir = $(sharedir)/gitweb
  localedir = $(sharedir)/locale
  template_dir = share/git-core/templates
 -htmldir = share/doc/git-doc
 +htmldir = $(prefix)/share/doc/git-doc
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
  # DESTDIR =
  pathsep = :
  
 +mandir_relative = $(patsubst $(prefix)/%,%,$(mandir))
 +infodir_relative = $(patsubst $(prefix)/%,%,$(infodir))
 +htmldir_relative = $(patsubst $(prefix)/%,%,$(htmldir))
 +
  export prefix bindir sharedir sysconfdir gitwebdir localedir
  
  CC = cc
@@@ -448,6 -449,7 +451,6 @@@ SCRIPT_SH += git-am.s
  SCRIPT_SH += git-bisect.sh
  SCRIPT_SH += git-difftool--helper.sh
  SCRIPT_SH += git-filter-branch.sh
 -SCRIPT_SH += git-lost-found.sh
  SCRIPT_SH += git-merge-octopus.sh
  SCRIPT_SH += git-merge-one-file.sh
  SCRIPT_SH += git-merge-resolve.sh
@@@ -455,7 -457,7 +458,7 @@@ SCRIPT_SH += git-mergetool.s
  SCRIPT_SH += git-pull.sh
  SCRIPT_SH += git-quiltimport.sh
  SCRIPT_SH += git-rebase.sh
 -SCRIPT_SH += git-repack.sh
 +SCRIPT_SH += git-remote-testgit.sh
  SCRIPT_SH += git-request-pull.sh
  SCRIPT_SH += git-stash.sh
  SCRIPT_SH += git-submodule.sh
@@@ -479,19 -481,14 +482,19 @@@ SCRIPT_PERL += git-relink.per
  SCRIPT_PERL += git-send-email.perl
  SCRIPT_PERL += git-svn.perl
  
 -SCRIPT_PYTHON += git-remote-testpy.py
  SCRIPT_PYTHON += git-p4.py
  
 +NO_INSTALL += git-remote-testgit
 +
  # Generated files for scripts
  SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
  SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
  SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
  
 +SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
 +SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
 +SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
 +
  # Individual rules to allow e.g.
  # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
  # from subdirectories like contrib/*/
@@@ -501,12 -498,12 +504,12 @@@ build-sh-script: $(SCRIPT_SH_GEN
  build-python-script: $(SCRIPT_PYTHON_GEN)
  
  .PHONY: install-perl-script install-sh-script install-python-script
 -install-sh-script: $(SCRIPT_SH_GEN)
 -	$(INSTALL) $(SCRIPT_SH_GEN) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 -install-perl-script: $(SCRIPT_PERL_GEN)
 -	$(INSTALL) $(SCRIPT_PERL_GEN) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 -install-python-script: $(SCRIPT_PYTHON_GEN)
 -	$(INSTALL) $(SCRIPT_PYTHON_GEN) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 +install-sh-script: $(SCRIPT_SH_INS)
 +	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 +install-perl-script: $(SCRIPT_PERL_INS)
 +	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 +install-python-script: $(SCRIPT_PYTHON_INS)
 +	$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  
  .PHONY: clean-perl-script clean-sh-script clean-python-script
  clean-sh-script:
@@@ -516,9 -513,9 +519,9 @@@ clean-perl-script
  clean-python-script:
  	$(RM) $(SCRIPT_PYTHON_GEN)
  
 -SCRIPTS = $(SCRIPT_SH_GEN) \
 -	  $(SCRIPT_PERL_GEN) \
 -	  $(SCRIPT_PYTHON_GEN) \
 +SCRIPTS = $(SCRIPT_SH_INS) \
 +	  $(SCRIPT_PERL_INS) \
 +	  $(SCRIPT_PYTHON_INS) \
  	  git-instaweb
  
  ETAGS_TARGET = TAGS
@@@ -551,7 -548,6 +554,7 @@@ TEST_PROGRAMS_NEED_X += test-dat
  TEST_PROGRAMS_NEED_X += test-delta
  TEST_PROGRAMS_NEED_X += test-dump-cache-tree
  TEST_PROGRAMS_NEED_X += test-genrandom
 +TEST_PROGRAMS_NEED_X += test-hashmap
  TEST_PROGRAMS_NEED_X += test-index-version
  TEST_PROGRAMS_NEED_X += test-line-buffer
  TEST_PROGRAMS_NEED_X += test-match-trees
@@@ -559,8 -555,6 +562,8 @@@ TEST_PROGRAMS_NEED_X += test-mergesor
  TEST_PROGRAMS_NEED_X += test-mktemp
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
 +TEST_PROGRAMS_NEED_X += test-prio-queue
 +TEST_PROGRAMS_NEED_X += test-read-cache
  TEST_PROGRAMS_NEED_X += test-regex
  TEST_PROGRAMS_NEED_X += test-revision-walking
  TEST_PROGRAMS_NEED_X += test-run-command
@@@ -570,7 -564,6 +573,7 @@@ TEST_PROGRAMS_NEED_X += test-sigchai
  TEST_PROGRAMS_NEED_X += test-string-list
  TEST_PROGRAMS_NEED_X += test-subprocess
  TEST_PROGRAMS_NEED_X += test-svn-fe
 +TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
  TEST_PROGRAMS_NEED_X += test-wildmatch
  
  TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
@@@ -583,8 -576,11 +586,8 @@@ BUILT_INS += git-cherry$
  BUILT_INS += git-cherry-pick$X
  BUILT_INS += git-format-patch$X
  BUILT_INS += git-fsck-objects$X
 -BUILT_INS += git-get-tar-commit-id$X
  BUILT_INS += git-init$X
  BUILT_INS += git-merge-subtree$X
 -BUILT_INS += git-peek-remote$X
 -BUILT_INS += git-repo-config$X
  BUILT_INS += git-show$X
  BUILT_INS += git-stage$X
  BUILT_INS += git-status$X
@@@ -642,6 -638,7 +645,6 @@@ LIB_H += color.
  LIB_H += column.h
  LIB_H += commit.h
  LIB_H += compat/bswap.h
 -LIB_H += compat/cygwin.h
  LIB_H += compat/mingw.h
  LIB_H += compat/obstack.h
  LIB_H += compat/poll/poll.h
@@@ -660,8 -657,6 +663,8 @@@ LIB_H += diff.
  LIB_H += diffcore.h
  LIB_H += dir.h
  LIB_H += exec_cmd.h
 +LIB_H += ewah/ewok.h
 +LIB_H += ewah/ewok_rlw.h
  LIB_H += fetch-pack.h
  LIB_H += fmt-merge-msg.h
  LIB_H += fsck.h
@@@ -670,13 -665,11 +673,13 @@@ LIB_H += git-compat-util.
  LIB_H += gpg-interface.h
  LIB_H += graph.h
  LIB_H += grep.h
 -LIB_H += hash.h
 +LIB_H += hashmap.h
  LIB_H += help.h
  LIB_H += http.h
  LIB_H += kwset.h
  LIB_H += levenshtein.h
 +LIB_H += line-log.h
 +LIB_H += line-range.h
  LIB_H += list-objects.h
  LIB_H += ll-merge.h
  LIB_H += log-tree.h
@@@ -686,18 -679,15 +689,18 @@@ LIB_H += merge-recursive.
  LIB_H += mergesort.h
  LIB_H += notes-cache.h
  LIB_H += notes-merge.h
 +LIB_H += notes-utils.h
  LIB_H += notes.h
  LIB_H += object.h
 -LIB_H += pack-refs.h
 +LIB_H += pack-objects.h
  LIB_H += pack-revindex.h
  LIB_H += pack.h
 +LIB_H += pack-bitmap.h
  LIB_H += parse-options.h
  LIB_H += patch-ids.h
  LIB_H += pathspec.h
  LIB_H += pkt-line.h
 +LIB_H += prio-queue.h
  LIB_H += progress.h
  LIB_H += prompt.h
  LIB_H += quote.h
@@@ -728,7 -718,6 +731,7 @@@ LIB_H += tree-walk.
  LIB_H += tree.h
  LIB_H += unpack-trees.h
  LIB_H += url.h
 +LIB_H += urlmatch.h
  LIB_H += userdiff.h
  LIB_H += utf8.h
  LIB_H += varint.h
@@@ -796,10 -785,6 +799,10 @@@ LIB_OBJS += dir.
  LIB_OBJS += editor.o
  LIB_OBJS += entry.o
  LIB_OBJS += environment.o
 +LIB_OBJS += ewah/bitmap.o
 +LIB_OBJS += ewah/ewah_bitmap.o
 +LIB_OBJS += ewah/ewah_io.o
 +LIB_OBJS += ewah/ewah_rlw.o
  LIB_OBJS += exec_cmd.o
  LIB_OBJS += fetch-pack.o
  LIB_OBJS += fsck.o
@@@ -807,14 -792,12 +810,14 @@@ LIB_OBJS += gettext.
  LIB_OBJS += gpg-interface.o
  LIB_OBJS += graph.o
  LIB_OBJS += grep.o
 -LIB_OBJS += hash.o
 +LIB_OBJS += hashmap.o
  LIB_OBJS += help.o
  LIB_OBJS += hex.o
  LIB_OBJS += ident.o
  LIB_OBJS += kwset.o
  LIB_OBJS += levenshtein.o
 +LIB_OBJS += line-log.o
 +LIB_OBJS += line-range.o
  LIB_OBJS += list-objects.o
  LIB_OBJS += ll-merge.o
  LIB_OBJS += lockfile.o
@@@ -829,12 -812,9 +832,12 @@@ LIB_OBJS += name-hash.
  LIB_OBJS += notes.o
  LIB_OBJS += notes-cache.o
  LIB_OBJS += notes-merge.o
 +LIB_OBJS += notes-utils.o
  LIB_OBJS += object.o
 +LIB_OBJS += pack-bitmap.o
 +LIB_OBJS += pack-bitmap-write.o
  LIB_OBJS += pack-check.o
 -LIB_OBJS += pack-refs.o
 +LIB_OBJS += pack-objects.o
  LIB_OBJS += pack-revindex.o
  LIB_OBJS += pack-write.o
  LIB_OBJS += pager.o
@@@ -847,7 -827,6 +850,7 @@@ LIB_OBJS += pathspec.
  LIB_OBJS += pkt-line.o
  LIB_OBJS += preload-index.o
  LIB_OBJS += pretty.o
 +LIB_OBJS += prio-queue.o
  LIB_OBJS += progress.o
  LIB_OBJS += prompt.o
  LIB_OBJS += quote.o
@@@ -886,13 -865,11 +889,13 @@@ LIB_OBJS += tree.
  LIB_OBJS += tree-walk.o
  LIB_OBJS += unpack-trees.o
  LIB_OBJS += url.o
 +LIB_OBJS += urlmatch.o
  LIB_OBJS += usage.o
  LIB_OBJS += userdiff.o
  LIB_OBJS += utf8.o
  LIB_OBJS += varint.o
  LIB_OBJS += version.o
 +LIB_OBJS += versioncmp.o
  LIB_OBJS += walker.o
  LIB_OBJS += wildmatch.o
  LIB_OBJS += wrapper.o
@@@ -913,7 -890,6 +916,7 @@@ BUILTIN_OBJS += builtin/bundle.
  BUILTIN_OBJS += builtin/cat-file.o
  BUILTIN_OBJS += builtin/check-attr.o
  BUILTIN_OBJS += builtin/check-ignore.o
 +BUILTIN_OBJS += builtin/check-mailmap.o
  BUILTIN_OBJS += builtin/check-ref-format.o
  BUILTIN_OBJS += builtin/checkout-index.o
  BUILTIN_OBJS += builtin/checkout.o
@@@ -937,7 -913,6 +940,7 @@@ BUILTIN_OBJS += builtin/fmt-merge-msg.
  BUILTIN_OBJS += builtin/for-each-ref.o
  BUILTIN_OBJS += builtin/fsck.o
  BUILTIN_OBJS += builtin/gc.o
 +BUILTIN_OBJS += builtin/get-tar-commit-id.o
  BUILTIN_OBJS += builtin/grep.o
  BUILTIN_OBJS += builtin/hash-object.o
  BUILTIN_OBJS += builtin/help.o
@@@ -974,7 -949,6 +977,7 @@@ BUILTIN_OBJS += builtin/reflog.
  BUILTIN_OBJS += builtin/remote.o
  BUILTIN_OBJS += builtin/remote-ext.o
  BUILTIN_OBJS += builtin/remote-fd.o
 +BUILTIN_OBJS += builtin/repack.o
  BUILTIN_OBJS += builtin/replace.o
  BUILTIN_OBJS += builtin/rerere.o
  BUILTIN_OBJS += builtin/reset.o
@@@ -989,6 -963,7 +992,6 @@@ BUILTIN_OBJS += builtin/show-ref.
  BUILTIN_OBJS += builtin/stripspace.o
  BUILTIN_OBJS += builtin/symbolic-ref.o
  BUILTIN_OBJS += builtin/tag.o
 -BUILTIN_OBJS += builtin/tar-tree.o
  BUILTIN_OBJS += builtin/unpack-file.o
  BUILTIN_OBJS += builtin/unpack-objects.o
  BUILTIN_OBJS += builtin/update-index.o
@@@ -1076,11 -1051,6 +1079,11 @@@ ifeq ($(uname_S),Darwin
  			BASIC_LDFLAGS += -L/opt/local/lib
  		endif
  	endif
 +	ifndef NO_APPLE_COMMON_CRYPTO
 +		APPLE_COMMON_CRYPTO = YesPlease
 +		COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO
 +	endif
 +	NO_REGEX = YesPlease
  	PTHREAD_LIBS =
  endif
  
@@@ -1185,9 -1155,6 +1188,9 @@@ ifdef NEEDS_SSL_WITH_CRYPT
  else
  	LIB_4_CRYPTO = $(OPENSSL_LINK) -lcrypto
  endif
 +ifdef APPLE_COMMON_CRYPTO
 +	LIB_4_CRYPTO += -framework Security -framework CoreFoundation
 +endif
  endif
  ifdef NEEDS_LIBICONV
  	ifdef ICONVDIR
@@@ -1280,6 -1247,20 +1283,6 @@@ endi
  ifdef NO_STRTOULL
  	COMPAT_CFLAGS += -DNO_STRTOULL
  endif
 -ifdef NO_FNMATCH
 -	COMPAT_CFLAGS += -Icompat/fnmatch
 -	COMPAT_CFLAGS += -DNO_FNMATCH
 -	COMPAT_OBJS += compat/fnmatch/fnmatch.o
 -else
 -ifdef NO_FNMATCH_CASEFOLD
 -	COMPAT_CFLAGS += -Icompat/fnmatch
 -	COMPAT_CFLAGS += -DNO_FNMATCH_CASEFOLD
 -	COMPAT_OBJS += compat/fnmatch/fnmatch.o
 -endif
 -endif
 -ifdef USE_WILDMATCH
 -	COMPAT_CFLAGS += -DUSE_WILDMATCH
 -endif
  ifdef NO_SETENV
  	COMPAT_CFLAGS += -DNO_SETENV
  	COMPAT_OBJS += compat/setenv.o
@@@ -1403,17 -1384,11 +1406,17 @@@ ifdef PPC_SHA
  	SHA1_HEADER = "ppc/sha1.h"
  	LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
  	LIB_H += ppc/sha1.h
 +else
 +ifdef APPLE_COMMON_CRYPTO
 +	COMPAT_CFLAGS += -DCOMMON_DIGEST_FOR_OPENSSL
 +	SHA1_HEADER = <CommonCrypto/CommonDigest.h>
  else
  	SHA1_HEADER = <openssl/sha.h>
  	EXTLIBS += $(LIB_4_CRYPTO)
  endif
  endif
 +endif
 +
  ifdef NO_PERL_MAKEMAKER
  	export NO_PERL_MAKEMAKER
  endif
@@@ -1471,6 -1446,9 +1474,6 @@@ ifdef NO_REGE
  	COMPAT_CFLAGS += -Icompat/regex
  	COMPAT_OBJS += compat/regex/regex.o
  endif
 -ifdef CYGWIN_V15_WIN32API
 -	COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
 -endif
  
  ifdef USE_NED_ALLOCATOR
         COMPAT_CFLAGS += -Icompat/nedmalloc
@@@ -1489,6 -1467,11 +1492,11 @@@ ifneq (,$(XDL_FAST_HASH)
  	BASIC_CFLAGS += -DXDL_FAST_HASH
  endif
  
+ ifdef GMTIME_UNRELIABLE_ERRORS
+ 	COMPAT_OBJS += compat/gmtime.o
+ 	BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS
+ endif
+ 
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK = NoThanks
  endif
@@@ -1522,7 -1505,6 +1530,7 @@@ ifndef 
  	QUIET_MSGFMT   = @echo '   ' MSGFMT $@;
  	QUIET_GCOV     = @echo '   ' GCOV $@;
  	QUIET_SP       = @echo '   ' SP $<;
 +	QUIET_RC       = @echo '   ' RC $@;
  	QUIET_SUBDIR0  = +@subdir=
  	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
  			 $(MAKE) $(PRINT_DIR) -C $$subdir
@@@ -1565,12 -1547,12 +1573,12 @@@ ETC_GITATTRIBUTES_SQ = $(subst ','\'',$
  DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
  bindir_SQ = $(subst ','\'',$(bindir))
  bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
 -mandir_SQ = $(subst ','\'',$(mandir))
 -infodir_SQ = $(subst ','\'',$(infodir))
 +mandir_relative_SQ = $(subst ','\'',$(mandir_relative))
 +infodir_relative_SQ = $(subst ','\'',$(infodir_relative))
  localedir_SQ = $(subst ','\'',$(localedir))
  gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
  template_dir_SQ = $(subst ','\'',$(template_dir))
 -htmldir_SQ = $(subst ','\'',$(htmldir))
 +htmldir_relative_SQ = $(subst ','\'',$(htmldir_relative))
  prefix_SQ = $(subst ','\'',$(prefix))
  gitwebdir_SQ = $(subst ','\'',$(gitwebdir))
  
@@@ -1579,7 -1561,6 +1587,7 @@@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PA
  PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
  TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
  DIFF_SQ = $(subst ','\'',$(DIFF))
 +PERLLIB_EXTRA_SQ = $(subst ','\'',$(PERLLIB_EXTRA))
  
  LIBS = $(GITLIBS) $(EXTLIBS)
  
@@@ -1654,6 -1635,9 +1662,6 @@@ ifndef NO_TCLT
  endif
  ifndef NO_PERL
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' localedir='$(localedir_SQ)' all
 -endif
 -ifndef NO_PYTHON
 -	$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all
  endif
  	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
  
@@@ -1663,7 -1647,7 +1671,7 @@@ please_set_SHELL_PATH_to_a_more_modern_
  shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell
  
  strip: $(PROGRAMS) git$X
 -	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
 +	$(STRIP) $(STRIP_OPTS) $^
  
  ### Target-specific flags and dependencies
  
@@@ -1700,9 -1684,9 +1708,9 @@@
  
  git.sp git.s git.o: GIT-PREFIX
  git.sp git.s git.o: EXTRA_CPPFLAGS = \
 -	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
 -	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
 -	'-DGIT_INFO_PATH="$(infodir_SQ)"'
 +	'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
 +	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
 +	'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
  
  git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
@@@ -1712,9 -1696,9 +1720,9 @@@ help.sp help.s help.o: common-cmds.
  
  builtin/help.sp builtin/help.s builtin/help.o: common-cmds.h GIT-PREFIX
  builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
 -	'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
 -	'-DGIT_MAN_PATH="$(mandir_SQ)"' \
 -	'-DGIT_INFO_PATH="$(infodir_SQ)"'
 +	'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
 +	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
 +	'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
  
  version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
  version.sp version.s version.o: EXTRA_CPPFLAGS = \
@@@ -1723,9 -1707,9 +1731,9 @@@
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
 -	ln git$X $@ 2>/dev/null || \
 -	ln -s git$X $@ 2>/dev/null || \
 -	cp git$X $@
 +	ln $< $@ 2>/dev/null || \
 +	ln -s $< $@ 2>/dev/null || \
 +	cp $< $@
  
  common-cmds.h: ./generate-cmdlist.sh command-list.txt
  
@@@ -1766,11 -1750,6 +1774,11 @@@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEF
  	$(QUIET_GEN)$(cmd_munge_script) && \
  	mv $@+ $@
  
 +git.res: git.rc GIT-VERSION-FILE
 +	$(QUIET_RC)$(RC) \
 +	  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
 +	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
 +
  ifndef NO_PERL
  $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
  
@@@ -1784,12 -1763,9 +1792,12 @@@ perl/PM.stamp: FORC
  perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
  
 -$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
 +PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
 +$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
 +	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
 +	INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
  	sed -e '1{' \
  	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
  	    -e '	h' \
@@@ -1798,17 -1774,10 +1806,17 @@@
  	    -e '	x' \
  	    -e '}' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 -	    $@.perl >$@+ && \
 +	    $< >$@+ && \
  	chmod +x $@+ && \
  	mv $@+ $@
  
 +GIT-PERL-DEFINES: FORCE
 +	@FLAGS='$(PERL_DEFINES)'; \
 +	    if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
 +		echo >&2 "    * new perl-specific parameters"; \
 +		echo "$$FLAGS" >$@; \
 +	    fi
 +
  
  .PHONY: gitweb
  gitweb:
@@@ -1829,15 -1798,20 +1837,15 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)) git
  endif # NO_PERL
  
  ifndef NO_PYTHON
 -$(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
 -$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
 +$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
 +$(SCRIPT_PYTHON_GEN): % : %.py
  	$(QUIET_GEN)$(RM) $@ $@+ && \
 -	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
 -		--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
 -		instlibdir` && \
  	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
 -	    -e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
 -	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
 -	    $@.py >$@+ && \
 +	    $< >$@+ && \
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PYTHON
 -$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : unimplemented.sh
 +$(SCRIPT_PYTHON_GEN): % : unimplemented.sh
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
@@@ -2020,9 -1994,6 +2028,9 @@@ gettext.sp gettext.s gettext.o: GIT-PRE
  gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \
  	-DGIT_LOCALE_PATH='"$(localedir_SQ)"'
  
 +http-push.sp http.sp http-walker.sp remote-curl.sp: SPARSE_FLAGS += \
 +	-DCURL_DISABLE_TYPECHECK
 +
  ifdef NO_EXPAT
  http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif
@@@ -2035,7 -2006,6 +2043,7 @@@ endi
  ifdef USE_NED_ALLOCATOR
  compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
  	-DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
 +compat/nedmalloc/nedmalloc.sp: SPARSE_FLAGS += -Wno-non-pointer-null
  endif
  
  git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
@@@ -2045,10 -2015,10 +2053,10 @@@ git-imap-send$X: imap-send.o GIT-LDFLAG
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
  
 -git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
 +git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL)
 -git-http-push$X: revision.o http.o http-push.o GIT-LDFLAGS $(GITLIBS)
 +git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
@@@ -2067,13 -2037,13 +2075,13 @@@ $(REMOTE_CURL_PRIMARY): remote-curl.o h
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
  $(LIB_FILE): $(LIB_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
 +	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
  
  $(XDIFF_LIB): $(XDIFF_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
 +	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
  
  $(VCSSVN_LIB): $(VCSSVN_OBJS)
 -	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
 +	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
  
  export DEFAULT_EDITOR DEFAULT_PAGER
  
@@@ -2191,9 -2161,6 +2199,9 @@@ GIT-BUILD-OPTIONS: FORC
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
  	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
  	@echo NO_UNIX_SOCKETS=\''$(subst ','\'',$(subst ','\'',$(NO_UNIX_SOCKETS)))'\' >>$@
 +ifdef TEST_OUTPUT_DIRECTORY
 +	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@
 +endif
  ifdef GIT_TEST_OPTS
  	@echo GIT_TEST_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_OPTS)))'\' >>$@
  endif
@@@ -2217,9 -2184,6 +2225,9 @@@ endi
  ifdef GIT_PERF_MAKE_OPTS
  	@echo GIT_PERF_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_MAKE_OPTS)))'\' >>$@
  endif
 +ifdef TEST_GIT_INDEX_VERSION
 +	@echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@
 +endif
  
  ### Detect Python interpreter path changes
  ifndef NO_PYTHON
@@@ -2236,7 -2200,6 +2244,7 @@@ endi
  test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))
  
  all:: $(TEST_PROGRAMS) $(test_bindir_programs)
 +all:: $(NO_INSTALL)
  
  bin-wrappers/%: wrap-for-bin.sh
  	@mkdir -p bin-wrappers
@@@ -2301,6 -2264,9 +2309,6 @@@ check: common-cmds.
  		exit 1; \
  	fi
  
 -remove-dashes:
 -	./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)
 -
  ### Installation rules
  
  ifneq ($(filter /%,$(firstword $(template_dir))),)
@@@ -2345,6 -2311,9 +2353,6 @@@ ifndef NO_PER
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C gitweb install
  endif
 -ifndef NO_PYTHON
 -	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
 -endif
  ifndef NO_TCLTK
  	$(MAKE) -C gitk-git install
  	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
@@@ -2476,12 -2445,11 +2484,12 @@@ profile-clean
  	$(RM) $(addsuffix *.gcda,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  
 -clean: profile-clean
 -	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
 -		builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
 +clean: profile-clean coverage-clean
 +	$(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
 +	$(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o
 +	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
 -	$(RM) $(TEST_PROGRAMS)
 +	$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
  	$(RM) -r bin-wrappers $(dep_dirs)
  	$(RM) -r po/build/
  	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
@@@ -2492,6 -2460,9 +2500,6 @@@
  ifndef NO_PERL
  	$(MAKE) -C gitweb clean
  	$(MAKE) -C perl clean
 -endif
 -ifndef NO_PYTHON
 -	$(MAKE) -C git_remote_helpers clean
  endif
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean
@@@ -2500,8 -2471,7 +2508,8 @@@ ifndef NO_TCLT
  	$(MAKE) -C git-gui clean
  endif
  	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-LDFLAGS GIT-BUILD-OPTIONS
 -	$(RM) GIT-USER-AGENT GIT-PREFIX GIT-SCRIPT-DEFINES GIT-PYTHON-VARS
 +	$(RM) GIT-USER-AGENT GIT-PREFIX
 +	$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PYTHON-VARS
  
  .PHONY: all install profile-clean clean strip
  .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
@@@ -2556,34 -2526,29 +2564,34 @@@ check-builtins:
  
  ### Test suite coverage testing
  #
 -.PHONY: coverage coverage-clean coverage-build coverage-report
 +.PHONY: coverage coverage-clean coverage-compile coverage-test coverage-report
 +.PHONY: coverage-clean-results
  
  coverage:
 -	$(MAKE) coverage-build
 -	$(MAKE) coverage-report
 +	$(MAKE) coverage-test
 +	$(MAKE) coverage-untested-functions
  
  object_dirs := $(sort $(dir $(OBJECTS)))
 -coverage-clean:
 +coverage-clean-results:
  	$(RM) $(addsuffix *.gcov,$(object_dirs))
  	$(RM) $(addsuffix *.gcda,$(object_dirs))
 -	$(RM) $(addsuffix *.gcno,$(object_dirs))
  	$(RM) coverage-untested-functions
  	$(RM) -r cover_db/
  	$(RM) -r cover_db_html/
  
 +coverage-clean: coverage-clean-results
 +	$(RM) $(addsuffix *.gcno,$(object_dirs))
 +
  COVERAGE_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
  COVERAGE_LDFLAGS = $(CFLAGS)  -O0 -lgcov
  GCOVFLAGS = --preserve-paths --branch-probabilities --all-blocks
  
 -coverage-build: coverage-clean
 +coverage-compile:
  	$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" all
 +
 +coverage-test: coverage-clean-results coverage-compile
  	$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
 -		-j1 test
 +		DEFAULT_TEST_TARGET=test -j1 test
  
  coverage-report:
  	$(QUIET_GCOV)for dir in $(object_dirs); do \
diff --combined config.mak.uname
index ce741fecd0,94cc108b4a..77d736c20f
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -108,6 -108,7 +108,6 @@@ ifeq ($(uname_S),SunOS
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
  	NO_REGEX = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
  	HAVE_DEV_TTY = YesPlease
  	ifeq ($(uname_R),5.6)
@@@ -157,18 -158,19 +157,18 @@@ ifeq ($(uname_O),Cygwin
  		NO_SYMLINK_HEAD = YesPlease
  		NO_IPV6 = YesPlease
  		OLD_ICONV = UnfortunatelyYes
 -		CYGWIN_V15_WIN32API = YesPlease
 +		NO_THREAD_SAFE_PREAD = YesPlease
 +		# There are conflicting reports about this.
 +		# On some boxes NO_MMAP is needed, and not so elsewhere.
 +		# Try commenting this out if you suspect MMAP is more efficient
 +		NO_MMAP = YesPlease
 +	else
 +		NO_REGEX = UnfortunatelyYes
  	endif
 -	NO_THREAD_SAFE_PREAD = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
 -	NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
 -	# There are conflicting reports about this.
 -	# On some boxes NO_MMAP is needed, and not so elsewhere.
 -	# Try commenting this out if you suspect MMAP is more efficient
 -	NO_MMAP = YesPlease
  	X = .exe
 -	COMPAT_OBJS += compat/cygwin.o
  	UNRELIABLE_FSTAT = UnfortunatelyYes
  	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
  endif
@@@ -187,6 -189,7 +187,7 @@@ ifeq ($(uname_S),FreeBSD
  	endif
  	PYTHON_PATH = /usr/local/bin/python
  	HAVE_PATHS_H = YesPlease
+ 	GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
@@@ -197,13 -200,6 +198,13 @@@
  	BASIC_LDFLAGS += -L/usr/local/lib
  	HAVE_PATHS_H = YesPlease
  endif
 +ifeq ($(uname_S),MirBSD)
 +	NO_STRCASESTR = YesPlease
 +	NO_MEMMEM = YesPlease
 +	USE_ST_TIMESPEC = YesPlease
 +	NEEDS_LIBICONV = YesPlease
 +	HAVE_PATHS_H = YesPlease
 +endif
  ifeq ($(uname_S),NetBSD)
  	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
  		NEEDS_LIBICONV = YesPlease
@@@ -258,6 -254,7 +259,6 @@@ ifeq ($(uname_S),IRIX
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_REGEX = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -277,6 -274,7 +278,6 @@@ ifeq ($(uname_S),IRIX64
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_REGEX = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -293,6 -291,7 +294,6 @@@ ifeq ($(uname_S),HP-UX
  	NO_UNSETENV = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_SYS_SELECT_H = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	NO_NSEC = YesPlease
  	ifeq ($(uname_R),B.11.00)
@@@ -323,14 -322,17 +324,14 @@@ ifeq ($(uname_S),Windows
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 -	NO_FNMATCH = YesPlease
  	NO_MEMMEM = YesPlease
  	# NEEDS_LIBICONV = YesPlease
  	NO_ICONV = YesPlease
  	NO_STRTOUMAX = YesPlease
 -	NO_STRTOULL = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	NO_SVN_TESTS = YesPlease
 -	NO_PERL_MAKEMAKER = YesPlease
  	RUNTIME_PREFIX = YesPlease
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
  	NO_NSEC = YesPlease
@@@ -339,12 -341,9 +340,12 @@@
  	UNRELIABLE_FSTAT = UnfortunatelyYes
  	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
  	NO_REGEX = YesPlease
 -	NO_CURL = YesPlease
 +	NO_GETTEXT = YesPlease
  	NO_PYTHON = YesPlease
  	BLK_SHA1 = YesPlease
 +	ETAGS_TARGET = ETAGS
 +	NO_INET_PTON = YesPlease
 +	NO_INET_NTOP = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
  	NATIVE_CRLF = YesPlease
  	DEFAULT_HELP_FORMAT = html
@@@ -382,11 -381,13 +383,11 @@@ ifeq ($(uname_S),Interix
  		NO_INET_NTOP = YesPlease
  		NO_INET_PTON = YesPlease
  		NO_SOCKADDR_STORAGE = YesPlease
 -		NO_FNMATCH_CASEFOLD = YesPlease
  	endif
  	ifeq ($(uname_R),5.2)
  		NO_INET_NTOP = YesPlease
  		NO_INET_PTON = YesPlease
  		NO_SOCKADDR_STORAGE = YesPlease
 -		NO_FNMATCH_CASEFOLD = YesPlease
  	endif
  endif
  ifeq ($(uname_S),Minix)
@@@ -431,6 -432,7 +432,6 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
  	NO_D_TYPE_IN_DIRENT = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_STRCASESTR = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_MEMMEM = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_SETENV = YesPlease
@@@ -474,8 -476,10 +475,8 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 -	NO_FNMATCH = YesPlease
  	NO_MEMMEM = YesPlease
  	NEEDS_LIBICONV = YesPlease
 -	OLD_ICONV = YesPlease
  	NO_STRTOUMAX = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_MKSTEMPS = YesPlease
@@@ -495,18 -499,13 +496,18 @@@
  	NO_INET_PTON = YesPlease
  	NO_INET_NTOP = YesPlease
  	NO_POSIX_GOODIES = UnfortunatelyYes
 -	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/win32
 +	DEFAULT_HELP_FORMAT = html
 +	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o
 +	BASIC_LDFLAGS += -Wl,--large-address-aware
  	EXTLIBS += -lws2_32
 +	GITLIBS += git.res
  	PTHREAD_LIBS =
 +	RC = windres -O coff
 +	NATIVE_CRLF = YesPlease
  	X = .exe
  	SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
  ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
@@@ -517,7 -516,6 +518,7 @@@
  	NO_R_TO_GCC_LINKER = YesPlease
  	INTERNAL_QSORT = YesPlease
  	HAVE_LIBCHARSET_H = YesPlease
 +	NO_GETTEXT = YesPlease
  else
  	NO_CURL = YesPlease
  endif
@@@ -527,6 -525,7 +528,6 @@@ ifeq ($(uname_S),QNX
  	EXPAT_NEEDS_XMLPARSE_H = YesPlease
  	HAVE_STRINGS_H = YesPlease
  	NEEDS_SOCKET = YesPlease
 -	NO_FNMATCH_CASEFOLD = YesPlease
  	NO_GETPAGESIZE = YesPlease
  	NO_ICONV = YesPlease
  	NO_MEMMEM = YesPlease
diff --combined git-compat-util.h
index 9158ed634a,66728145b4..f6d3a46622
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -75,7 -75,7 +75,7 @@@
  # endif
  #elif !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && \
        !defined(_M_UNIX) && !defined(__sgi) && !defined(__DragonFly__) && \
 -      !defined(__TANDEM) && !defined(__QNX__)
 +      !defined(__TANDEM) && !defined(__QNX__) && !defined(__MirBSD__)
  #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
  #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
  #endif
@@@ -85,14 -85,10 +85,14 @@@
  #define _NETBSD_SOURCE 1
  #define _SGI_SOURCE 1
  
 -#ifdef WIN32 /* Both MinGW and MSVC */
 +#if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
 +# if defined (_MSC_VER) && !defined(_WIN32_WINNT)
 +#  define _WIN32_WINNT 0x0502
 +# endif
  #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
  #include <winsock2.h>
  #include <windows.h>
 +#define GIT_WINDOWS_NATIVE
  #endif
  
  #include <unistd.h>
@@@ -116,6 -112,9 +116,6 @@@
  #include <sys/time.h>
  #include <time.h>
  #include <signal.h>
 -#ifndef USE_WILDMATCH
 -#include <fnmatch.h>
 -#endif
  #include <assert.h>
  #include <regex.h>
  #include <utime.h>
@@@ -125,7 -124,6 +125,7 @@@
  #else
  #include <poll.h>
  #endif
 +
  #if defined(__MINGW32__)
  /* pull in Windows compatibility stuff */
  #include "compat/mingw.h"
@@@ -166,6 -164,7 +166,6 @@@ typedef unsigned long uintptr_t
  #undef _XOPEN_SOURCE
  #include <grp.h>
  #define _XOPEN_SOURCE 600
 -#include "compat/cygwin.h"
  #else
  #undef _ALL_SOURCE /* AIX 5.3L defines a struct list with _ALL_SOURCE. */
  #include <grp.h>
@@@ -292,16 -291,18 +292,16 @@@ extern char *gitbasename(char *)
  #endif
  #endif
  
 +/* The sentinel attribute is valid from gcc version 4.0 */
 +#if defined(__GNUC__) && (__GNUC__ >= 4)
 +#define LAST_ARG_MUST_BE_NULL __attribute__((sentinel))
 +#else
 +#define LAST_ARG_MUST_BE_NULL
 +#endif
 +
  #include "compat/bswap.h"
  
 -#ifdef USE_WILDMATCH
  #include "wildmatch.h"
 -#define FNM_PATHNAME WM_PATHNAME
 -#define FNM_CASEFOLD WM_CASEFOLD
 -#define FNM_NOMATCH  WM_NOMATCH
 -static inline int fnmatch(const char *pattern, const char *string, int flags)
 -{
 -	return wildmatch(pattern, string, flags, NULL);
 -}
 -#endif
  
  /* General helper functions */
  extern void vreportf(const char *prefix, const char *err, va_list params);
@@@ -313,16 -314,6 +313,16 @@@ extern NORETURN void die_errno(const ch
  extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));
  extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
  
 +#ifndef NO_OPENSSL
 +#ifdef APPLE_COMMON_CRYPTO
 +#include "compat/apple-common-crypto.h"
 +#else
 +#include <openssl/evp.h>
 +#include <openssl/hmac.h>
 +#endif /* APPLE_COMMON_CRYPTO */
 +#include <openssl/x509v3.h>
 +#endif /* NO_OPENSSL */
 +
  /*
   * Let callers be aware of the constant return value; this can help
   * gcc with -Wuninitialized analysis. We restrict this trick to gcc, though,
@@@ -338,16 -329,13 +338,16 @@@ extern void set_die_routine(NORETURN_PT
  extern void set_error_routine(void (*routine)(const char *err, va_list params));
  extern void set_die_is_recursing_routine(int (*routine)(void));
  
 -extern int prefixcmp(const char *str, const char *prefix);
 -extern int suffixcmp(const char *str, const char *suffix);
 +extern int starts_with(const char *str, const char *prefix);
 +extern int ends_with(const char *str, const char *suffix);
  
  static inline const char *skip_prefix(const char *str, const char *prefix)
  {
 -	size_t len = strlen(prefix);
 -	return strncmp(str, prefix, len) ? NULL : str + len;
 +	do {
 +		if (!*prefix)
 +			return str;
 +	} while (*str++ == *prefix++);
 +	return NULL;
  }
  
  #if defined(NO_MMAP) || defined(USE_WIN32_MMAP)
@@@ -469,15 -457,9 +469,15 @@@ extern FILE *git_fopen(const char*, con
  #endif
  
  #ifdef SNPRINTF_RETURNS_BOGUS
 +#ifdef snprintf
 +#undef snprintf
 +#endif
  #define snprintf git_snprintf
  extern int git_snprintf(char *str, size_t maxsize,
  			const char *format, ...);
 +#ifdef vsnprintf
 +#undef vsnprintf
 +#endif
  #define vsnprintf git_vsnprintf
  extern int git_vsnprintf(char *str, size_t maxsize,
  			 const char *format, va_list ap);
@@@ -516,7 -498,7 +516,7 @@@ int inet_pton(int af, const char *src, 
  const char *inet_ntop(int af, const void *src, char *dst, size_t size);
  #endif
  
 -extern void release_pack_memory(size_t, int);
 +extern void release_pack_memory(size_t);
  
  typedef void (*try_to_free_t)(size_t);
  extern try_to_free_t set_try_to_free_routine(try_to_free_t);
@@@ -536,7 -518,7 +536,7 @@@ extern FILE *xfdopen(int fd, const cha
  extern int xmkstemp(char *template);
  extern int xmkstemp_mode(char *template, int mode);
  extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
 -extern int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1);
 +extern int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1);
  
  static inline size_t xsize_t(off_t len)
  {
@@@ -706,9 -688,8 +706,9 @@@ int remove_or_warn(unsigned int mode, c
   * Call access(2), but warn for any error except "missing file"
   * (ENOENT or ENOTDIR).
   */
 -int access_or_warn(const char *path, int mode);
 -int access_or_die(const char *path, int mode);
 +#define ACCESS_EACCES_OK (1U << 0)
 +int access_or_warn(const char *path, int mode, unsigned flag);
 +int access_or_die(const char *path, int mode, unsigned flag);
  
  /* Warn on an inaccessible file that ought to be accessible */
  void warn_on_inaccessible(const char *path);
@@@ -716,4 -697,11 +716,11 @@@
  /* Get the passwd entry for the UID of the current process. */
  struct passwd *xgetpwuid_self(void);
  
+ #ifdef GMTIME_UNRELIABLE_ERRORS
+ struct tm *git_gmtime(const time_t *);
+ struct tm *git_gmtime_r(const time_t *, struct tm *);
+ #define gmtime git_gmtime
+ #define gmtime_r git_gmtime_r
+ #endif
+ 
  #endif
diff --combined t/t4212-log-corrupt.sh
index 3fa171541a,1863e7163c..58b792bf20
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@@ -13,16 -13,11 +13,16 @@@ test_expect_success 'setup' 
  	git update-ref refs/heads/broken_email $(cat broken_email.hash)
  '
  
 +test_expect_success 'fsck notices broken commit' '
 +	git fsck 2>actual &&
 +	test_i18ngrep invalid.author actual
 +'
 +
  test_expect_success 'git log with broken author email' '
  	{
  		echo commit $(cat broken_email.hash)
  		echo "Author: A U Thor <author@example.com>"
 -		echo "Date:   Thu Jan 1 00:00:00 1970 +0000"
 +		echo "Date:   Thu Apr 7 15:13:13 2005 -0700"
  		echo
  		echo "    foo"
  	} >expect.out &&
@@@ -35,7 -30,7 +35,7 @@@
  '
  
  test_expect_success 'git log --format with broken author email' '
 -	echo "A U Thor+author@example.com+" >expect.out &&
 +	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
  	: >expect.err &&
  
  	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
@@@ -82,11 -77,9 +82,9 @@@ test_expect_success 'date parser recogn
  '
  
  # date is within 2^63-1, but enough to choke glibc's gmtime
- test_expect_success 'absurdly far-in-future dates produce sentinel' '
+ test_expect_success 'absurdly far-in-future date' '
  	commit=$(munge_author_date HEAD 999999999999999999) &&
- 	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
- 	git log -1 --format=%ad $commit >actual &&
- 	test_cmp expect actual
+ 	git log -1 --format=%ad $commit
  '
  
  test_done