Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bd5e59e

Browse files
ethomsonEdward Thomson
authored and
Edward Thomson
committed
crlf: include utf8 resources in master branch
Include the UTF8 and UTF8 BOM tests in the master crlf test branch for completeness.
1 parent 84f8f50 commit bd5e59e

18 files changed

+11
-9
lines changed

tests/checkout/crlf.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,22 @@ void test_checkout_crlf__detect_crlf_autocrlf_true_utf8(void)
115115

116116
cl_repo_set_bool(g_repo, "core.autocrlf", true);
117117

118-
git_repository_set_head(g_repo, "refs/heads/utf8");
118+
git_repository_set_head(g_repo, "refs/heads/master");
119119
git_checkout_head(g_repo, &opts);
120120

121121
if (GIT_EOL_NATIVE == GIT_EOL_LF)
122122
{
123-
check_file_contents("./crlf/few-utf8-chars-lf.txt", FEW_UTF8_LF_RAW);
124-
check_file_contents("./crlf/many-utf8-chars-lf.txt", MANY_UTF8_LF_RAW);
123+
check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_LF_RAW);
124+
check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_LF_RAW);
125125
}
126126
else
127127
{
128-
check_file_contents("./crlf/few-utf8-chars-lf.txt", FEW_UTF8_CRLF_RAW);
129-
check_file_contents("./crlf/many-utf8-chars-lf.txt", MANY_UTF8_CRLF_RAW);
128+
check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_CRLF_RAW);
129+
check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_CRLF_RAW);
130130
}
131131

132-
check_file_contents("./crlf/few-utf8-chars-crlf.txt", FEW_UTF8_CRLF_RAW);
133-
check_file_contents("./crlf/many-utf8-chars-crlf.txt", MANY_UTF8_CRLF_RAW);
132+
check_file_contents("./crlf/few-utf8-chars-crlf", FEW_UTF8_CRLF_RAW);
133+
check_file_contents("./crlf/many-utf8-chars-crlf", MANY_UTF8_CRLF_RAW);
134134
}
135135

136136
void test_checkout_crlf__autocrlf_true_index_size_is_filtered_size(void)

tests/resources/crlf/.gitted/index

1 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
x��Kj�0Ьu���},� !d� &h�Z�0������Qv�gW������u��z���9O�AH�v� �B��h�9!�EM��}��c�f��52v�%�m�` /������=����Z��Ë �Moe�V���3��
2+
fr1�pѓ�j�8�����.�[_������K^�@����k�ѡYj
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
x��Q�1D��)�j'�d2"��)�x�N���,3��x��^AQ�j)���U�D`��iJֻ>Fc:D�&Rr.��1#��D�Ǔ��,���H��Pϖ}����9rPGŏ6� ~� �����a/ }����I����D�x$k��j���&_֨G��Z��כ���›��|�� ǸU�
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6c589757f65a970a6cc07c71c3f3d2528c611cbc
1+
5afb6a14a864e30787857dd92af837e8cdd2cb1b

tests/resources/crlf/.gitted/refs/heads/utf8

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)