|
 |
6743a1 |
From f5b2c9c98eedc2af38efea91e2702fe8a7e70a6a Mon Sep 17 00:00:00 2001
|
|
|
6743a1 |
From: Todd Zullinger <tmz@pobox.com>
|
|
|
6743a1 |
Date: Fri, 7 Sep 2018 19:22:05 -0400
|
|
|
6743a1 |
Subject: [PATCH] t5551-http-fetch-smart.sh: sort cookies before comparing
|
|
|
6743a1 |
MIME-Version: 1.0
|
|
|
6743a1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
6743a1 |
Content-Transfer-Encoding: 8bit
|
|
|
6743a1 |
|
|
|
6743a1 |
With curl-7.61.1 cookies are sorted by creation-time¹. Sort the output
|
|
|
6743a1 |
used in the 'cookies stored in http.cookiefile when http.savecookies
|
|
|
6743a1 |
set' test before comparing it to the expected cookies.
|
|
|
6743a1 |
|
|
|
6743a1 |
¹ https://github.com/curl/curl/commit/e2ef8d6fa ("cookies: support
|
|
|
6743a1 |
creation-time attribute for cookies", 2018-08-28)
|
|
|
6743a1 |
|
|
|
6743a1 |
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
|
|
6743a1 |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
|
6743a1 |
---
|
|
|
6743a1 |
t/t5551-http-fetch-smart.sh | 2 +-
|
|
|
6743a1 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6743a1 |
|
|
|
6743a1 |
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
|
|
|
6743a1 |
index 771f36f9ff473..538656bfef09b 100755
|
|
|
6743a1 |
--- a/t/t5551-http-fetch-smart.sh
|
|
|
6743a1 |
+++ b/t/t5551-http-fetch-smart.sh
|
|
|
6743a1 |
@@ -215,7 +215,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
|
|
|
6743a1 |
git config http.cookiefile cookies.txt &&
|
|
|
6743a1 |
git config http.savecookies true &&
|
|
|
6743a1 |
git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
|
|
|
6743a1 |
- tail -3 cookies.txt >cookies_tail.txt &&
|
|
|
6743a1 |
+ tail -3 cookies.txt | sort >cookies_tail.txt &&
|
|
|
6743a1 |
test_cmp expect_cookies.txt cookies_tail.txt
|
|
|
6743a1 |
'
|
|
|
6743a1 |
|