diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-08 09:04:39 -0400 |
---|---|---|
committer | Edward Thomson <ethomson@microsoft.com> | 2015-06-22 11:59:54 -0400 |
commit | bd5e59ee72113206e0f0d64853413f7dc41156bf (patch) | |
tree | 44ebf73b2511888c7a7b68f3de6712d20472f523 /tests | |
parent | 84f8f5004662b1443c358afcc3a8a36f4b1d7d25 (diff) | |
download | libgit2-bd5e59ee72113206e0f0d64853413f7dc41156bf.tar.gz |
crlf: include utf8 resources in master branch
Include the UTF8 and UTF8 BOM tests in the master crlf test
branch for completeness.
Diffstat (limited to 'tests')
18 files changed, 11 insertions, 9 deletions
diff --git a/tests/checkout/crlf.c b/tests/checkout/crlf.c index 61459b3a4..2db5835b5 100644 --- a/tests/checkout/crlf.c +++ b/tests/checkout/crlf.c @@ -115,22 +115,22 @@ void test_checkout_crlf__detect_crlf_autocrlf_true_utf8(void) cl_repo_set_bool(g_repo, "core.autocrlf", true); - git_repository_set_head(g_repo, "refs/heads/utf8"); + git_repository_set_head(g_repo, "refs/heads/master"); git_checkout_head(g_repo, &opts); if (GIT_EOL_NATIVE == GIT_EOL_LF) { - check_file_contents("./crlf/few-utf8-chars-lf.txt", FEW_UTF8_LF_RAW); - check_file_contents("./crlf/many-utf8-chars-lf.txt", MANY_UTF8_LF_RAW); + check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_LF_RAW); + check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_LF_RAW); } else { - check_file_contents("./crlf/few-utf8-chars-lf.txt", FEW_UTF8_CRLF_RAW); - check_file_contents("./crlf/many-utf8-chars-lf.txt", MANY_UTF8_CRLF_RAW); + check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_CRLF_RAW); + check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_CRLF_RAW); } - check_file_contents("./crlf/few-utf8-chars-crlf.txt", FEW_UTF8_CRLF_RAW); - check_file_contents("./crlf/many-utf8-chars-crlf.txt", MANY_UTF8_CRLF_RAW); + check_file_contents("./crlf/few-utf8-chars-crlf", FEW_UTF8_CRLF_RAW); + check_file_contents("./crlf/many-utf8-chars-crlf", MANY_UTF8_CRLF_RAW); } void test_checkout_crlf__autocrlf_true_index_size_is_filtered_size(void) diff --git a/tests/resources/crlf/.gitted/index b/tests/resources/crlf/.gitted/index Binary files differindex fb2f7db2f..e8d43e97e 100644 --- a/tests/resources/crlf/.gitted/index +++ b/tests/resources/crlf/.gitted/index diff --git a/tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 b/tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 Binary files differnew file mode 100644 index 000000000..5c5c24cd5 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 diff --git a/tests/resources/crlf/.gitted/objects/18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 b/tests/resources/crlf/.gitted/objects/18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 Binary files differnew file mode 100644 index 000000000..790eb1324 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 diff --git a/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 b/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 Binary files differnew file mode 100644 index 000000000..4a4e4dc9e --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 diff --git a/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 b/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 Binary files differnew file mode 100644 index 000000000..f5421cf6a --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 diff --git a/tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea b/tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea Binary files differnew file mode 100644 index 000000000..0e4afbbba --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea diff --git a/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b b/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b Binary files differnew file mode 100644 index 000000000..72dc780a0 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b diff --git a/tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b b/tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b Binary files differnew file mode 100644 index 000000000..11a25c581 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b diff --git a/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e b/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e new file mode 100644 index 000000000..f8d489fcb --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e @@ -0,0 +1,2 @@ +xKj0Ьu},!d &hZ0QvgWuz9OAHvBh9!EM}cf52v%m`/=ZËMoeV3 +fr1pѓj8.[_
K^@kѡYj
\ No newline at end of file diff --git a/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede b/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede Binary files differnew file mode 100644 index 000000000..a377cb04d --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede diff --git a/tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 b/tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 Binary files differnew file mode 100644 index 000000000..a08789b54 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 diff --git a/tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 b/tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 Binary files differnew file mode 100644 index 000000000..72cf3b0fd --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 diff --git a/tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 b/tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 new file mode 100644 index 000000000..62835b9e1 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 @@ -0,0 +1 @@ +xQ1D)j'd2")xN,3x^AQj)UD`iJֻ>Fc:D&Rr.1#DǓ,HPϖ}9rPGŏ6 ~a/}IDx$kj&_֨GZכ|ǸU
\ No newline at end of file diff --git a/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 b/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 Binary files differnew file mode 100644 index 000000000..7b2e7a116 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 diff --git a/tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b b/tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b Binary files differnew file mode 100644 index 000000000..8552c7bf7 --- /dev/null +++ b/tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b diff --git a/tests/resources/crlf/.gitted/refs/heads/master b/tests/resources/crlf/.gitted/refs/heads/master index 5f1597c04..fe1d0aa03 100644 --- a/tests/resources/crlf/.gitted/refs/heads/master +++ b/tests/resources/crlf/.gitted/refs/heads/master @@ -1 +1 @@ -6c589757f65a970a6cc07c71c3f3d2528c611cbc +5afb6a14a864e30787857dd92af837e8cdd2cb1b diff --git a/tests/resources/crlf/.gitted/refs/heads/utf8 b/tests/resources/crlf/.gitted/refs/heads/utf8 deleted file mode 100644 index 30ab61cd3..000000000 --- a/tests/resources/crlf/.gitted/refs/heads/utf8 +++ /dev/null @@ -1 +0,0 @@ -a234455d62297f1856c4603686150c59fcb0aafe |