Todd Zullinger <tmz@xxxxxxxxx> writes: > 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@xxxxxxxxx> > --- > [Resending with the list in Cc; sorry for spamming you, > Junio, Jeff, and Gábor.] > ... > 7ae89caac6c721f16555e981eaeed64abc165c5d refs/heads/master > 263207bb5fbfbefbdf1c9c3fa4ae5d9663323217 refs/namespaces/ns/refs/heads/master > ++ tail -3 cookies.txt > ++ test_cmp expect_cookies.txt cookies_tail.txt > ++ diff -u expect_cookies.txt cookies_tail.txt > --- expect_cookies.txt 2018-09-07 07:29:05.231532462 +0000 > +++ cookies_tail.txt 2018-09-07 07:29:05.306532366 +0000 Have you tried to apply this e-mail yourself before spamming the list ;-)? A good way to add supporting material that may be confusing to the patch text itself is to indent them by one place with SP. I'll manage anyway; thanks for a patch. > @@ -1,3 +1,3 @@ > > -127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue > 127.0.0.1 FALSE /smart_cookies/repo.git/info/ FALSE 0 name value > +127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue > error: last command exited with $?=1 > not ok 22 - cookies stored in http.cookiefile when http.savecookies set > > 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 > --- 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 > '
