From: Junio C Hamano Date: Sun, 10 Nov 2019 09:02:17 +0000 (+0900) Subject: Merge branch 'bc/hash-independent-tests-part-6' X-Git-Tag: v2.25.0-rc0~135 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28014c1084c0180c71af9ffaaca82a57e48b76b5;p=thirdparty%2Fgit.git Merge branch 'bc/hash-independent-tests-part-6' Test updates to prepare for SHA-2 transition continues. * bc/hash-independent-tests-part-6: t4048: abstract away SHA-1-specific constants t4045: make hash-size independent t4044: update test to work with SHA-256 t4039: abstract away SHA-1-specific constants t4038: abstract away SHA-1 specific constants t4034: abstract away SHA-1-specific constants t4027: make hash-size independent t4015: abstract away SHA-1-specific constants t4011: abstract away SHA-1-specific constants t4010: abstract away SHA-1-specific constants t3429: remove SHA1 annotation t1305: avoid comparing extensions rev-parse: add a --show-object-format option t/oid-info: add empty tree and empty blob values t/oid-info: allow looking up hash algorithm name --- 28014c1084c0180c71af9ffaaca82a57e48b76b5 diff --cc t/t4038-diff-combined.sh index b9d876efa2,15fc054fdb..b5a56895e8 --- a/t/t4038-diff-combined.sh +++ b/t/t4038-diff-combined.sh @@@ -507,9 -514,9 +514,9 @@@ test_expect_success FUNNYNAMES '--combi ' test_expect_success FUNNYNAMES '--combined-all-paths and --raw -and -z and funny names' ' - printf "aaf8087c3cbd4db8e185a2d074cf27c53cfb75d7\0::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect && + printf "$head\0::100644 100644 100644 $side1df $side2df $headf RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect && git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual && - test_cmp -a expect actual + test_cmp expect actual ' test_expect_success FUNNYNAMES '--combined-all-paths and --cc and funny names' '