From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Mar 2017 20:56:41 +0000 (-0700)
Subject: Merge branch 'jh/mingw-openssl-sha1' into maint
X-Git-Tag: v2.12.1~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/890d76504c79677c27f6661c0663e73519405ca3?hp=-c

Merge branch 'jh/mingw-openssl-sha1' into maint

Windows port wants to use OpenSSL's implementation of SHA-1
routines, so let them.

* jh/mingw-openssl-sha1:
mingw: use OpenSSL's SHA-1 routines
---

890d76504c79677c27f6661c0663e73519405ca3
diff --combined config.mak.uname
index 447f36ac2e,3c295c91d0..a07936da8b
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -17,6 -17,9 +17,6 @@@ endi
  # because maintaining the nesting to match is a pain.  If
  # we had "elif" things would have been much nicer...
  
 -ifeq ($(uname_M),x86_64)
 -	XDL_FAST_HASH = YesPlease
 -endif
  ifeq ($(uname_S),OSF1)
  	# Need this for u_short definitions et al
  	BASIC_CFLAGS += -D_OSF_SOURCE
@@@ -515,7 -518,6 +515,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
  	NO_REGEX = YesPlease
  	NO_PYTHON = YesPlease
- 	BLK_SHA1 = YesPlease
  	ETAGS_TARGET = ETAGS
  	NO_INET_PTON = YesPlease
  	NO_INET_NTOP = YesPlease