From 1cb6673d8f12215d41a199d88dc1003b269b1f86 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 12 Sep 2018 15:15:13 -0400 Subject: [PATCH] Update t5551 w/curl-7.61.1 patch Add a link to the upstream commit and use that patch. The patch content is the same -- only the metadata differs. --- ...p-fetch-smart.sh-sort-cookies-before-compar.patch | 12 ++++-------- git.spec | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch index e8df864..7cc468b 100644 --- a/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch +++ b/0001-t5551-http-fetch-smart.sh-sort-cookies-before-compar.patch @@ -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 -To: Junio C Hamano -Cc: Jeff King , SZEDER Gábor -Date: Fri, 7 Sep 2018 17:26:26 -0400 +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 @@ -16,12 +14,13 @@ set' test before comparing it to the expected cookies. creation-time attribute for cookies", 2018-08-28) Signed-off-by: Todd Zullinger +Signed-off-by: Junio C Hamano --- 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 771f36f9ff..538656bfef 100755 +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 @@ -33,6 +32,3 @@ index 771f36f9ff..538656bfef 100755 test_cmp expect_cookies.txt cookies_tail.txt ' --- -2.19.0.rc2 - diff --git a/git.spec b/git.spec index ef132e1..78b6305 100644 --- a/git.spec +++ b/git.spec @@ -120,6 +120,7 @@ Patch0: git-1.8-gitweb-home-link.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}