diff options
Diffstat (limited to 'system/git/disable-t2082-2.patch')
| -rw-r--r-- | system/git/disable-t2082-2.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/system/git/disable-t2082-2.patch b/system/git/disable-t2082-2.patch new file mode 100644 index 000000000..b18a9caa7 --- /dev/null +++ b/system/git/disable-t2082-2.patch @@ -0,0 +1,36 @@ +--- a/t/t2082-parallel-checkout-attributes.sh 2021-11-24 19:29:21.000000000 +0000 ++++ b/t/t2082-parallel-checkout-attributes.sh 2022-01-12 17:29:58.890000000 +0000 +@@ -33,33 +33,6 @@ + ) + ' + +-test_expect_success 'parallel-checkout with re-encoding' ' +- set_checkout_config 2 0 && +- git init encoding && +- ( +- cd encoding && +- echo text >utf8-text && +- write_utf16 <utf8-text >utf16-text && +- +- echo "A working-tree-encoding=UTF-16" >.gitattributes && +- cp utf16-text A && +- cp utf8-text B && +- git add A B .gitattributes && +- git commit -m encoding && +- +- # Check that A is stored in UTF-8 +- git cat-file -p :A >A.internal && +- test_cmp_bin utf8-text A.internal && +- +- rm A B && +- test_checkout_workers 2 git checkout A B && +- +- # Check that A (and only A) is re-encoded during checkout +- test_cmp_bin utf16-text A && +- test_cmp_bin utf8-text B +- ) +-' +- + test_expect_success 'parallel-checkout with eol conversions' ' + set_checkout_config 2 0 && + git init eol && |