diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2019-01-03 12:01:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-03 12:01:52 +0000 |
commit | 9084712b555a876873bd7d7583f5befd47647c9d (patch) | |
tree | a7fea9181a01a15a983b4456045a66df14213d79 /tests/resources/crlf | |
parent | 77f1460fcf6de77aebd55fc5ef30a663df38a55e (diff) | |
parent | e385e6474eb288be2efa11d126bd78df274a7932 (diff) | |
download | libgit2-9084712b555a876873bd7d7583f5befd47647c9d.tar.gz |
Merge pull request #4904 from libgit2/ethomson/crlf
Update CRLF filtering to match modern git
Diffstat (limited to 'tests/resources/crlf')
-rw-r--r-- | tests/resources/crlf/.gitattributes | 1 | ||||
-rw-r--r-- | tests/resources/crlf/all-crlf | 4 | ||||
-rw-r--r-- | tests/resources/crlf/all-crlf-utf8bom | 4 | ||||
-rw-r--r-- | tests/resources/crlf/all-lf | 5 | ||||
-rw-r--r-- | tests/resources/crlf/all-lf-utf8bom | 5 | ||||
-rw-r--r-- | tests/resources/crlf/binary-all-crlf | 4 | ||||
-rw-r--r-- | tests/resources/crlf/binary-all-lf | 4 | ||||
-rw-r--r-- | tests/resources/crlf/binary-mixed-lf-cr | 3 | ||||
-rw-r--r-- | tests/resources/crlf/binary-mixed-lf-cr-crlf | 3 | ||||
-rw-r--r-- | tests/resources/crlf/few-utf8-chars-crlf | 22 | ||||
-rw-r--r-- | tests/resources/crlf/few-utf8-chars-lf | 22 | ||||
-rw-r--r-- | tests/resources/crlf/many-utf8-chars-crlf | 4 | ||||
-rw-r--r-- | tests/resources/crlf/many-utf8-chars-lf | 4 | ||||
-rw-r--r-- | tests/resources/crlf/mixed-lf-cr | 3 | ||||
-rw-r--r-- | tests/resources/crlf/mixed-lf-cr-crlf | 3 | ||||
-rw-r--r-- | tests/resources/crlf/more-crlf | 5 | ||||
-rw-r--r-- | tests/resources/crlf/more-crlf-utf8bom | 5 | ||||
-rw-r--r-- | tests/resources/crlf/more-lf | 5 | ||||
-rw-r--r-- | tests/resources/crlf/more-lf-utf8bom | 5 | ||||
-rw-r--r-- | tests/resources/crlf/zero-byte | 0 |
20 files changed, 111 insertions, 0 deletions
diff --git a/tests/resources/crlf/.gitattributes b/tests/resources/crlf/.gitattributes new file mode 100644 index 000000000..fa1385d99 --- /dev/null +++ b/tests/resources/crlf/.gitattributes @@ -0,0 +1 @@ +* -text diff --git a/tests/resources/crlf/all-crlf b/tests/resources/crlf/all-crlf new file mode 100644 index 000000000..a9a2e8913 --- /dev/null +++ b/tests/resources/crlf/all-crlf @@ -0,0 +1,4 @@ +crlf
+crlf
+crlf
+crlf
diff --git a/tests/resources/crlf/all-crlf-utf8bom b/tests/resources/crlf/all-crlf-utf8bom new file mode 100644 index 000000000..0aa76e474 --- /dev/null +++ b/tests/resources/crlf/all-crlf-utf8bom @@ -0,0 +1,4 @@ +crlf
+crlf
+crlf
+crlf
diff --git a/tests/resources/crlf/all-lf b/tests/resources/crlf/all-lf new file mode 100644 index 000000000..799770d1c --- /dev/null +++ b/tests/resources/crlf/all-lf @@ -0,0 +1,5 @@ +lf +lf +lf +lf +lf diff --git a/tests/resources/crlf/all-lf-utf8bom b/tests/resources/crlf/all-lf-utf8bom new file mode 100644 index 000000000..7cce67e58 --- /dev/null +++ b/tests/resources/crlf/all-lf-utf8bom @@ -0,0 +1,5 @@ +lf +lf +lf +lf +lf diff --git a/tests/resources/crlf/binary-all-crlf b/tests/resources/crlf/binary-all-crlf new file mode 100644 index 000000000..85340755c --- /dev/null +++ b/tests/resources/crlf/binary-all-crlf @@ -0,0 +1,4 @@ +one
+two
+three
+four
diff --git a/tests/resources/crlf/binary-all-lf b/tests/resources/crlf/binary-all-lf new file mode 100644 index 000000000..af6fcf6da --- /dev/null +++ b/tests/resources/crlf/binary-all-lf @@ -0,0 +1,4 @@ +one +two +three +four diff --git a/tests/resources/crlf/binary-mixed-lf-cr b/tests/resources/crlf/binary-mixed-lf-cr new file mode 100644 index 000000000..203555c56 --- /dev/null +++ b/tests/resources/crlf/binary-mixed-lf-cr @@ -0,0 +1,3 @@ +one +two
three +four
\ No newline at end of file diff --git a/tests/resources/crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf/binary-mixed-lf-cr-crlf new file mode 100644 index 000000000..aaf083a9c --- /dev/null +++ b/tests/resources/crlf/binary-mixed-lf-cr-crlf @@ -0,0 +1,3 @@ +one +two
three
+four
\ No newline at end of file diff --git a/tests/resources/crlf/few-utf8-chars-crlf b/tests/resources/crlf/few-utf8-chars-crlf new file mode 100644 index 000000000..0e0528888 --- /dev/null +++ b/tests/resources/crlf/few-utf8-chars-crlf @@ -0,0 +1,22 @@ +⚽The rest is ASCII01.
+The rest is ASCII02.
+The rest is ASCII03.
+The rest is ASCII04.
+The rest is ASCII05.
+The rest is ASCII06.
+The rest is ASCII07.
+The rest is ASCII08.
+The rest is ASCII09.
+The rest is ASCII10.
+The rest is ASCII11.
+The rest is ASCII12.
+The rest is ASCII13.
+The rest is ASCII14.
+The rest is ASCII15.
+The rest is ASCII16.
+The rest is ASCII17.
+The rest is ASCII18.
+The rest is ASCII19.
+The rest is ASCII20.
+The rest is ASCII21.
+The rest is ASCII22.
diff --git a/tests/resources/crlf/few-utf8-chars-lf b/tests/resources/crlf/few-utf8-chars-lf new file mode 100644 index 000000000..f4d25b796 --- /dev/null +++ b/tests/resources/crlf/few-utf8-chars-lf @@ -0,0 +1,22 @@ +⚽The rest is ASCII01. +The rest is ASCII02. +The rest is ASCII03. +The rest is ASCII04. +The rest is ASCII05. +The rest is ASCII06. +The rest is ASCII07. +The rest is ASCII08. +The rest is ASCII09. +The rest is ASCII10. +The rest is ASCII11. +The rest is ASCII12. +The rest is ASCII13. +The rest is ASCII14. +The rest is ASCII15. +The rest is ASCII16. +The rest is ASCII17. +The rest is ASCII18. +The rest is ASCII19. +The rest is ASCII20. +The rest is ASCII21. +The rest is ASCII22. diff --git a/tests/resources/crlf/many-utf8-chars-crlf b/tests/resources/crlf/many-utf8-chars-crlf new file mode 100644 index 000000000..cd574f5a2 --- /dev/null +++ b/tests/resources/crlf/many-utf8-chars-crlf @@ -0,0 +1,4 @@ +Lets sing!
+♫♪♬♩
+Eat food
+🍅🍕
diff --git a/tests/resources/crlf/many-utf8-chars-lf b/tests/resources/crlf/many-utf8-chars-lf new file mode 100644 index 000000000..9a6c3533f --- /dev/null +++ b/tests/resources/crlf/many-utf8-chars-lf @@ -0,0 +1,4 @@ +Lets sing! +♫♪♬♩ +Eat food +🍅🍕 diff --git a/tests/resources/crlf/mixed-lf-cr b/tests/resources/crlf/mixed-lf-cr new file mode 100644 index 000000000..d11e7ef63 --- /dev/null +++ b/tests/resources/crlf/mixed-lf-cr @@ -0,0 +1,3 @@ +one +two
three +four
\ No newline at end of file diff --git a/tests/resources/crlf/mixed-lf-cr-crlf b/tests/resources/crlf/mixed-lf-cr-crlf new file mode 100644 index 000000000..417786fc3 --- /dev/null +++ b/tests/resources/crlf/mixed-lf-cr-crlf @@ -0,0 +1,3 @@ +one +two
three
+four
\ No newline at end of file diff --git a/tests/resources/crlf/more-crlf b/tests/resources/crlf/more-crlf new file mode 100644 index 000000000..0ff5a53f1 --- /dev/null +++ b/tests/resources/crlf/more-crlf @@ -0,0 +1,5 @@ +crlf
+crlf
+lf +crlf
+crlf
diff --git a/tests/resources/crlf/more-crlf-utf8bom b/tests/resources/crlf/more-crlf-utf8bom new file mode 100644 index 000000000..ea030d3c6 --- /dev/null +++ b/tests/resources/crlf/more-crlf-utf8bom @@ -0,0 +1,5 @@ +crlf
+crlf
+lf +crlf
+crlf
diff --git a/tests/resources/crlf/more-lf b/tests/resources/crlf/more-lf new file mode 100644 index 000000000..04de00b35 --- /dev/null +++ b/tests/resources/crlf/more-lf @@ -0,0 +1,5 @@ +lf +lf +crlf
+lf +lf diff --git a/tests/resources/crlf/more-lf-utf8bom b/tests/resources/crlf/more-lf-utf8bom new file mode 100644 index 000000000..dc88e3b91 --- /dev/null +++ b/tests/resources/crlf/more-lf-utf8bom @@ -0,0 +1,5 @@ +lf +lf +crlf
+lf +lf diff --git a/tests/resources/crlf/zero-byte b/tests/resources/crlf/zero-byte new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/resources/crlf/zero-byte |