From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 17 Jul 2021 00:42:47 +0000 (-0700)
Subject: Merge branch 'js/config-mak-windows-pcre-fix'
X-Git-Tag: v2.33.0-rc0~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fba551379ef89b92b9356caa4096144026250c22;p=thirdparty%2Fgit.git

Merge branch 'js/config-mak-windows-pcre-fix'

Whitespace fix.

* js/config-mak-windows-pcre-fix:
  config.mak.uname: PCRE1 cleanup
---

fba551379ef89b92b9356caa4096144026250c22
diff --cc config.mak.uname
index 0587a23c1c,e8ceaed3d3..69413fb3dc
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -673,14 -668,9 +673,14 @@@ els
  		HAVE_LIBCHARSET_H = YesPlease
  		NO_GETTEXT =
  		USE_GETTEXT_SCHEME = fallthrough
- 		USE_LIBPCRE= YesPlease
+ 		USE_LIBPCRE = YesPlease
  		NO_CURL =
  		USE_NED_ALLOCATOR = YesPlease
 +		ifeq (/mingw64,$(subst 32,64,$(prefix)))
 +			# Move system config into top-level /etc/
 +			ETC_GITCONFIG = ../etc/gitconfig
 +			ETC_GITATTRIBUTES = ../etc/gitattributes
 +		endif
  	else
  		COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
  		NO_CURL = YesPlease