[packages/git-core] up to 2.13.0

[atler]

commit 0aa13f228776bda88ba9a36cc77bc26e01bc6f32
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed May 10 18:48:00 2017 +0200

    up to 2.13.0
    
    - dropped tests patch (all tests fixed upstream)

 git-core-tests.patch | 82 ----------------------------------------------------
 git-core.spec        | 16 +++++-----
 2 files changed, 7 insertions(+), 91 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index 29f5eff..e7c69bb 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,12 +14,12 @@
 Summary:	Distributed version control system focused on speed, effectivity and usability
 Summary(pl.UTF-8):	Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:		git-core
-Version:	2.12.2
+Version:	2.13.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5:	ad5ae08664c40caf074392abc301cccd
+# Source0-md5:	a18711ae968ded392d2208c8c6277b7d
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -27,10 +27,9 @@ Source4:	%{name}.sysconfig
 Source5:	%{name}.inet
 Source6:	%{name}.init
 Source7:	gitolite.pl
-Patch0:		%{name}-tests.patch
-Patch1:		%{name}-key-bindings.patch
-Patch2:		%{name}-sysconfdir.patch
-Patch3:		cherry-picked-commitlog.patch
+Patch0:		%{name}-key-bindings.patch
+Patch1:		%{name}-sysconfdir.patch
+Patch2:		cherry-picked-commitlog.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -457,10 +456,9 @@ Moduł trzeba zarejestrować poleceniem:
 
 %prep
 %setup -q -n git-%{version}
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 
diff --git a/git-core-tests.patch b/git-core-tests.patch
deleted file mode 100644
index b71a8cd..0000000
--- a/git-core-tests.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -ur git-2.12.1.orig/t/t5615-alternate-env.sh git-2.12.1/t/t5615-alternate-env.sh
---- git-2.12.1.orig/t/t5615-alternate-env.sh	2017-03-22 18:52:45.344354935 +0100
-+++ git-2.12.1/t/t5615-alternate-env.sh	2017-03-22 18:52:59.320917887 +0100
-@@ -77,6 +77,7 @@
- 	check_obj "$quoted:$unquoted" <<-EOF
- 	$one blob
- 	$two blob
-+	EOF
- '
- 
- test_expect_success !MINGW 'broken quoting falls back to interpreting raw' '
-diff -ur git-2.12.1.orig/t/t7004-tag.sh git-2.12.1/t/t7004-tag.sh
---- git-2.12.1.orig/t/t7004-tag.sh	2017-03-22 18:52:45.347688243 +0100
-+++ git-2.12.1/t/t7004-tag.sh	2017-03-22 18:53:28.757366131 +0100
-@@ -880,21 +880,13 @@
- '
- 
- test_expect_success 'verifying a proper tag with --format pass and format accordingly' '
--	cat >expect <<-\EOF
-+	cat >expect <<-\EOF &&
- 	tagname : signed-tag
--	EOF &&
-+	EOF
- 	git tag -v --format="tagname : %(tag)" "signed-tag" >actual &&
- 	test_cmp expect actual
- '
- 
--test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
--	cat >expect <<-\EOF
--	tagname : forged-tag
--	EOF &&
--	test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual &&
--	test_cmp expect actual
--'
--
- # blank and empty messages for signed tags:
- 
- get_tag_header empty-signed-tag $commit commit $time >expect
---- git-2.12.1.orig/t/t7030-verify-tag.sh	2017-03-22 18:52:45.347688243 +0100
-+++ git-2.12.1/t/t7030-verify-tag.sh	2017-03-22 19:06:41.894375653 +0100
-@@ -126,19 +126,11 @@
- '
- 
- test_expect_success 'verifying tag with --format' '
--	cat >expect <<-\EOF
-+	cat >expect <<-\EOF &&
- 	tagname : fourth-signed
--	EOF &&
-+	EOF
- 	git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual &&
- 	test_cmp expect actual
- '
- 
--test_expect_success 'verifying a forged tag with --format fail and format accordingly' '
--	cat >expect <<-\EOF
--	tagname : 7th forged-signed
--	EOF &&
--	test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged &&
--	test_cmp expect actual-forged
--'
--
- test_done
---- git-2.12.1.orig/t/t7406-submodule-update.sh	2017-03-22 18:52:45.347688243 +0100
-+++ git-2.12.1/t/t7406-submodule-update.sh	2017-03-22 19:16:48.043071963 +0100
-@@ -440,17 +440,6 @@
- 	) &&
- 	test_i18ncmp actual expect
- '
--
--test_expect_success 'submodule update - command run for initial population of submodule' '
--	cat <<-\ EOF >expect
--	Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\''
--	EOF &&
--	rm -rf super/submodule &&
--	test_must_fail git -C super submodule update >../actual &&
--	test_cmp expect actual &&
--	git -C super submodule update --checkout
--'
--
- cat << EOF >expect
- Execution of 'false $submodulesha1' failed in submodule path '../super/submodule'
- Failed to recurse into submodule path '../super'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/0aa13f228776bda88ba9a36cc77bc26e01bc6f32