Update to 2.19.2
Release notes: https://www.kernel.org/pub/software/scm/git/docs/RelNotes/2.19.2.txt
This commit is contained in:
parent
a6a24cf421
commit
e46c99bb3b
@ -1,34 +0,0 @@
|
|||||||
From f5b2c9c98eedc2af38efea91e2702fe8a7e70a6a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Date: Fri, 7 Sep 2018 19:22:05 -0400
|
|
||||||
Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output
|
|
||||||
used in the 'cookies stored in http.cookiefile when http.savecookies
|
|
||||||
set' test before comparing it to the expected cookies.
|
|
||||||
|
|
||||||
¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support
|
|
||||||
creation-time attribute for cookies", 2018-08-28)
|
|
||||||
|
|
||||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
||||||
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
||||||
---
|
|
||||||
t/t5551-http-fetch-smart.sh | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
|
|
||||||
index 771f36f9ff473..538656bfef09b 100755
|
|
||||||
--- a/t/t5551-http-fetch-smart.sh
|
|
||||||
+++ b/t/t5551-http-fetch-smart.sh
|
|
||||||
@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
|
|
||||||
git config http.cookiefile cookies.txt &&
|
|
||||||
git config http.savecookies true &&
|
|
||||||
git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
|
|
||||||
- tail -3 cookies.txt >cookies_tail.txt &&
|
|
||||||
+ tail -3 cookies.txt | sort >cookies_tail.txt &&
|
|
||||||
test_cmp expect_cookies.txt cookies_tail.txt
|
|
||||||
'
|
|
||||||
|
|
11
git.spec
11
git.spec
@ -87,8 +87,8 @@
|
|||||||
#global rcrev .rc0
|
#global rcrev .rc0
|
||||||
|
|
||||||
Name: git
|
Name: git
|
||||||
Version: 2.19.1
|
Version: 2.19.2
|
||||||
Release: 2%{?rcrev}%{?dist}
|
Release: 1%{?rcrev}%{?dist}
|
||||||
Summary: Fast Version Control System
|
Summary: Fast Version Control System
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://git-scm.com/
|
URL: https://git-scm.com/
|
||||||
@ -120,10 +120,6 @@ Source99: print-failed-test-output
|
|||||||
Patch0: git-1.8-gitweb-home-link.patch
|
Patch0: git-1.8-gitweb-home-link.patch
|
||||||
# https://bugzilla.redhat.com/490602
|
# https://bugzilla.redhat.com/490602
|
||||||
Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
|
Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
|
||||||
# curl-7.61.1 changes cookie sort order
|
|
||||||
# https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com/
|
|
||||||
# https://github.com/git/git/commit/f5b2c9c98e.patch
|
|
||||||
Patch2: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch
|
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
# pod2man is needed to build Git.3pm
|
# pod2man is needed to build Git.3pm
|
||||||
@ -919,6 +915,9 @@ make -C contrib/credential/netrc/ testverbose
|
|||||||
%{?with_docs:%{_pkgdocdir}/git-svn.html}
|
%{?with_docs:%{_pkgdocdir}/git-svn.html}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 21 2018 Todd Zullinger <tmz@pobox.com> - 2.19.2-1
|
||||||
|
- Update to 2.19.2
|
||||||
|
|
||||||
* Tue Oct 23 2018 Todd Zullinger <tmz@pobox.com>
|
* Tue Oct 23 2018 Todd Zullinger <tmz@pobox.com>
|
||||||
- Skip test BuildRequires when --without tests is used
|
- Skip test BuildRequires when --without tests is used
|
||||||
- Simplify gpg verification of Source0
|
- Simplify gpg verification of Source0
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (git-2.19.1.tar.xz) = a1bc1032b1de9eb9ea8b7c385cd009f64247e13066e0a91e9682e35400ded05f88c23b523cca4782f57544060d6ba0f9d3bec944399cda5771a4945c38bb9b98
|
SHA512 (git-2.19.2.tar.xz) = 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96
|
||||||
SHA512 (git-2.19.1.tar.sign) = ec8a88b27411ca08eaa682536219dd2ffbe2bbeaf88ebcea5c3ec5caa7351de5815139e63d295c1108717d50e76ecbfe3d36b1199ef148a06ebe58f37510e6e9
|
SHA512 (git-2.19.2.tar.sign) = 702c421f312b2a91610b636f9091a1193ef05b3107375b69c9f97c7070143dfe7a01ceeaabe68e06fb06a9e097b8d8846409f76a7b3ce60fc91eb5de72c6538b
|
||||||
|
Loading…
Reference in New Issue
Block a user