diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-02-11 17:27:30 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-02-11 17:27:30 -0800 |
| commit | dbd2ca356b8a16d028e45c5263e9c460be13d338 (patch) | |
| tree | eb4ddbfb5778e3beb24a6a4663847708f1c0b91f | |
| parent | 90dd28640757a59f51cd52eabd98119f60026586 (diff) | |
| parent | 2a528bc088f566ad3301963304da8942400f261b (diff) | |
| download | libgit2-dbd2ca356b8a16d028e45c5263e9c460be13d338.tar.gz | |
Merge pull request #2115 from ethomson/crlf_redux
Fix filter test for CRLF->LF issues
| -rw-r--r-- | tests/filter/blob.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/filter/blob.c b/tests/filter/blob.c index 8dce6470a..48edb8405 100644 --- a/tests/filter/blob.c +++ b/tests/filter/blob.c @@ -41,7 +41,8 @@ void test_filter_blob__all_crlf(void) cl_git_pass(git_blob_filtered_content(&buf, blob, "file.lf", 1)); - cl_assert_equal_s(ALL_CRLF_TEXT_AS_LF, buf.ptr); + /* we never convert CRLF -> LF on platforms that have LF */ + cl_assert_equal_s(ALL_CRLF_TEXT_AS_CRLF, buf.ptr); git_buf_free(&buf); git_blob_free(blob); |