diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-24 17:55:15 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-06-24 17:55:15 +0200 |
| commit | 3ddd0d929d329c09c5bf37258b81c76b52c68c56 (patch) | |
| tree | 88df0e5c4968710912ca2da8ae7b4f760c6fb652 /tests/checkout | |
| parent | 29fe897d80c0b66bebb35ca6fd34473b5edb9a60 (diff) | |
| parent | 5a76ad35aaf709503dfc939464715666919180f8 (diff) | |
| download | libgit2-3ddd0d929d329c09c5bf37258b81c76b52c68c56.tar.gz | |
Merge remote-tracking branch 'upstream/cmn/mixed-eol-passthrough'
Diffstat (limited to 'tests/checkout')
| -rw-r--r-- | tests/checkout/crlf.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/checkout/crlf.c b/tests/checkout/crlf.c index 6b2c1b122..2c84a77f3 100644 --- a/tests/checkout/crlf.c +++ b/tests/checkout/crlf.c @@ -79,10 +79,7 @@ void test_checkout_crlf__more_lf_autocrlf_true(void) git_checkout_head(g_repo, &opts); - if (GIT_EOL_NATIVE == GIT_EOL_LF) - check_file_contents("./crlf/more-lf", MORE_LF_TEXT_RAW); - else - check_file_contents("./crlf/more-lf", MORE_LF_TEXT_AS_CRLF); + check_file_contents("./crlf/more-lf", MORE_LF_TEXT_RAW); } void test_checkout_crlf__more_crlf_autocrlf_true(void) @@ -94,10 +91,7 @@ void test_checkout_crlf__more_crlf_autocrlf_true(void) git_checkout_head(g_repo, &opts); - if (GIT_EOL_NATIVE == GIT_EOL_LF) - check_file_contents("./crlf/more-crlf", MORE_CRLF_TEXT_RAW); - else - check_file_contents("./crlf/more-crlf", MORE_CRLF_TEXT_AS_CRLF); + check_file_contents("./crlf/more-crlf", MORE_CRLF_TEXT_RAW); } void test_checkout_crlf__all_crlf_autocrlf_true(void) |