Commit dbd2ca356b8a16d028e45c5263e9c460be13d338

Edward Thomson 2014-02-11T17:27:30

Merge pull request #2115 from ethomson/crlf_redux Fix filter test for CRLF->LF issues

1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/tests/filter/blob.c b/tests/filter/blob.c
index 8dce647..48edb84 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);