| 1 |
From 0f1a223660db65668b3dcac52228cd2d442d6f53 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Todd Zullinger <tmz@pobox.com> |
| 3 |
To: Junio C Hamano <gitster@pobox.com> |
| 4 |
Cc: Jeff King <peff@peff.net>, SZEDER Gábor <szeder.dev@gmail.com> |
| 5 |
Date: Fri, 7 Sep 2018 17:26:26 -0400 |
| 6 |
Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing |
| 7 |
MIME-Version: 1.0 |
| 8 |
Content-Type: text/plain; charset=UTF-8 |
| 9 |
Content-Transfer-Encoding: 8bit |
| 10 |
|
| 11 |
With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output |
| 12 |
used in the 'cookies stored in http.cookiefile when http.savecookies |
| 13 |
set' test before comparing it to the expected cookies. |
| 14 |
|
| 15 |
¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support |
| 16 |
creation-time attribute for cookies", 2018-08-28) |
| 17 |
|
| 18 |
Signed-off-by: Todd Zullinger <tmz@pobox.com> |
| 19 |
--- |
| 20 |
t/t5551-http-fetch-smart.sh | 2 +- |
| 21 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh |
| 24 |
index 771f36f9ff..538656bfef 100755 |
| 25 |
--- a/t/t5551-http-fetch-smart.sh |
| 26 |
+++ b/t/t5551-http-fetch-smart.sh |
| 27 |
@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set |
| 28 |
git config http.cookiefile cookies.txt && |
| 29 |
git config http.savecookies true && |
| 30 |
git ls-remote $HTTPD_URL/smart_cookies/repo.git master && |
| 31 |
- tail -3 cookies.txt >cookies_tail.txt && |
| 32 |
+ tail -3 cookies.txt | sort >cookies_tail.txt && |
| 33 |
test_cmp expect_cookies.txt cookies_tail.txt |
| 34 |
' |
| 35 |
|
| 36 |
-- |
| 37 |
2.19.0.rc2 |
| 38 |
|
Parent Directory
| 
Revision Log