From c0942863fbcf0949219dc0be4def80e650b7da90 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Sun, 30 Nov 2014 11:15:57 +0300
Subject: [PATCH] git: Update to 2.2.0

---
 git/PKGBUILD                       | 8 ++++----
 git/git-1.9.0-manifest-msys2.patch | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/git/PKGBUILD b/git/PKGBUILD
index d1c31b51..1c88d06e 100644
--- a/git/PKGBUILD
+++ b/git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=git
-pkgver=2.1.3
+pkgver=2.2.0
 pkgrel=1
 pkgdesc="The fast distributed version control system"
 arch=('i686' 'x86_64')
@@ -36,10 +36,10 @@ source=(#"http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
         1.7.9-cygwin.patch
         git-1.9.0-manifest-msys2.patch
         git-1.8.4-msys2.patch)
-md5sums=('9dfb41c1abb4ce0f49c8484a36cadf65'
-         'c8d6c30fa7de9e3859ca66609109e3a4'
+md5sums=('2d5bbcc3e887cc4ba499f80420e2d5f7'
+         'f584e2ecbc6e1485163b56c14ea7ffda'
          'c33c9dfa2944a0de9151a7af7a63a27b'
-         '6091627ea0b56ba4a7e3b71ed40605ed'
+         '6870e9f77f2fb60e006fc8fa484ba3ff'
          '9f9170a30dfb7643df4948cdae5bb864')
 
 prepare() {
diff --git a/git/git-1.9.0-manifest-msys2.patch b/git/git-1.9.0-manifest-msys2.patch
index fb3bc58c..e5a34a24 100644
--- a/git/git-1.9.0-manifest-msys2.patch
+++ b/git/git-1.9.0-manifest-msys2.patch
@@ -125,9 +125,9 @@ Signed-off-by: Cesar Eduardo Barros <ces...@cesarb.net>
  
 -git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
 +git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(RESOURCE_OBJS) $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \
--		$(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
-+		$(BUILTIN_OBJS) $(RESOURCE_OBJS) $(ALL_LDFLAGS) $(LIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) git.o \
+-		$(BUILTIN_OBJS) $(LIBS)
++		$(BUILTIN_OBJS) $(RESOURCE_OBJS) $(LIBS)
  
  help.sp help.s help.o: common-cmds.h