Merge pull request msys2#2199 from yasuhirokimura/update_git_to_2_29_0

Update git to 2.29.0

Author: lazka

git/PKGBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Ray Donnelly <[email protected]>
 
 pkgname=git
-pkgver=2.28.0
+pkgver=2.29.0
 pkgrel=1
 pkgdesc="The fast distributed version control system"
 arch=('i686' 'x86_64')
@@ -52,9 +52,9 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
         git-2.8.2-Cygwin-Allow-DOS-paths.patch
         git-tcsh-completion-fixes.patch
         git-zsh-completion-fixes.patch)
-sha256sums=('02016d16dbce553699db5c9c04f6d13a3f50727c652061b7eb97a828d045e534'
+sha256sums=('efbf650f4c563a3ab9b0ebd63c2d784ad03a49ee253ef924f4ca1afb0c813454'
             'c5e735d829e11f79e2d508b663d0924030498f48fc716881031fb975dbf187a5'
-            '7b396dfd36dede1796c3f80f66270ebab4a2f2cbdc23e8adae9c482439b46e77'
+            '47f5ff7840fa00665702fa70e5cc744de23b63ce2d9d787e2f86d2c54d57cc7a'
             '340d289f8a9d82975b34bd635e8c734c0c8529d5ac1ad9bbc8a77ed752502b02'
             'f67412f829e026b677d4c3ceacfb21da0549ad4636fb07c283e52c3fd5aa3e22'
             '905e35e145be34f6affad830155a193d869da4898e46726f36cef2e89c073d23'
@@ -147,6 +147,4 @@ package() {
     "${pkgdir}"/usr/lib/git-core/git-p4 \
     "${pkgdir}"/usr/share/git/remote-helpers/git-remote-bzr \
     "${pkgdir}"/usr/share/git/remote-helpers/git-remote-hg
-  sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python|' \
-    "${pkgdir}"/usr/share/git/svn-fe/svnrdump_sim.py
 }

git/git-1.9.0-manifest-msys2.patch

@@ -100,19 +100,14 @@ index ddd1bdf..6ee4500 100644
 
  help.sp help.s help.o: common-cmds.h
 
-@@ -2046,25 +2054,25 @@ compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
+@@ -2046,17 +2054,17 @@ compat/nedmalloc/nedmalloc.sp compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
  compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
  endif
 
 -git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
 +git-%$X: %.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 
--git-bugreport$X: bugreport.o GIT-LDFLAGS $(GITLIBS)
-+git-bugreport$X: bugreport.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(LIBS)
- 
 -git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
 +git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
@@ -127,11 +122,6 @@ index ddd1bdf..6ee4500 100644
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
 
--git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
-+git-remote-testsvn$X: remote-testsvn.o $(RESOURCE_OBJS) GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \
- 	$(VCSSVN_LIB)
- 
 @@ -2070,10 +2078,15 @@ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
  	ln -s $< $@ 2>/dev/null || \
  	cp $< $@