rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update t5551 w/curl-7.61.1 patch

Browse Source 
Add a link to the upstream commit and use that patch.  The patch content
is the same -- only the metadata differs.
This commit is contained in:
Todd Zullinger 2018-09-12 15:15:13 -04:00
parent dc9c346ade
commit 1cb6673d8f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch
View File

@ -1,8 +1,6 @@
From 0f1a223660db65668b3dcac52228cd2d442d6f53 Mon Sep 17 00:00:00 2001 From f5b2c9c98eedc2af38efea91e2702fe8a7e70a6a Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com> From: Todd Zullinger <tmz@pobox.com>
To: Junio C Hamano <gitster@pobox.com> Date: Fri, 7 Sep 2018 19:22:05 -0400
Cc: Jeff King <peff@peff.net>, SZEDER Gábor <szeder.dev@gmail.com>
Date: Fri, 7 Sep 2018 17:26:26 -0400
Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@ -16,12 +14,13 @@ set' test before comparing it to the expected cookies.
creation-time attribute for cookies", 2018-08-28) creation-time attribute for cookies", 2018-08-28)
Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
--- ---
t/t5551-http-fetch-smart.sh | 2 +- t/t5551-http-fetch-smart.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 771f36f9ff..538656bfef 100755 index 771f36f9ff473..538656bfef09b 100755
--- a/t/t5551-http-fetch-smart.sh --- a/t/t5551-http-fetch-smart.sh
+++ b/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 @@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
@ -33,6 +32,3 @@ index 771f36f9ff..538656bfef 100755
test_cmp expect_cookies.txt cookies_tail.txt test_cmp expect_cookies.txt cookies_tail.txt
' '
--
2.19.0.rc2

1
git.spec
View File

@ -120,6 +120,7 @@ Patch0: git-1.8-gitweb-home-link.patch
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 # curl-7.61.1 changes cookie sort order
# https://public-inbox.org/git/20180907232205.31328-1-tmz@pobox.com/ # 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 Patch2: 0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch
%if %{with docs} %if %{with docs}