Commit ad5a696eb2f2ddc757a1adb85a7aee911531333f

Sven Strickroth 2017-01-28T17:11:55

tests: crlf: update POSIX test data to reflect Git 2.9+ behavior Update with vanilla Git 2.11.0 on Debian Signed-off-by: Sven Strickroth <email@cs-ware.de>

diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-all-lf
index 8534075..af6fcf6 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-all-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-all-lf
@@ -1,4 +1,4 @@
-one
-two
-three
-four
+one
+two
+three
+four
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr
index fd2abfa..203555c 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-two
three
+one
+two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
index fd2abfa..aaf083a 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr
index df8c0f6..d11e7ef 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-two
three
+one
+two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf
index df8c0f6..417786f 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf
index e682c30..0ff5a53 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom
index 2e1220c..ea030d3 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf
index 6da5b0c..04de00b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom
index 3fa59c8..dc88e3b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-all-lf
index 8534075..af6fcf6 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-all-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-all-lf
@@ -1,4 +1,4 @@
-one
-two
-three
-four
+one
+two
+three
+four
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr
index fd2abfa..203555c 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-two
three
+one
+two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
index fd2abfa..aaf083a 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr
index df8c0f6..d11e7ef 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-two
three
+one
+two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf
index df8c0f6..417786f 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf
index e682c30..0ff5a53 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom
index 2e1220c..ea030d3 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf
index 6da5b0c..04de00b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom
index 3fa59c8..dc88e3b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-all-lf
index 8534075..af6fcf6 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-all-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-all-lf
@@ -1,4 +1,4 @@
-one
-two
-three
-four
+one
+two
+three
+four
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr
index fd2abfa..203555c 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-two
three
+one
+two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
index fd2abfa..aaf083a 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr
index df8c0f6..d11e7ef 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr
@@ -1,3 +1,3 @@
-one
-two
three
+one
+two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf
index df8c0f6..417786f 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf
@@ -1,3 +1,3 @@
-one
+one
 two
three
 four
\ No newline at end of file
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf
index e682c30..0ff5a53 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom
index 2e1220c..ea030d3 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf
index 6da5b0c..04de00b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom
index 3fa59c8..dc88e3b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf
index e682c30..0ff5a53 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf-utf8bom
index 2e1220c..ea030d3 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-crlf-utf8bom
@@ -1,5 +1,5 @@
 crlf
 crlf
-lf
+lf
 crlf
 crlf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf
index 6da5b0c..04de00b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf
diff --git a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf-utf8bom b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf-utf8bom
index 3fa59c8..dc88e3b 100644
--- a/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf-utf8bom
+++ b/tests/resources/crlf_data/posix/autocrlf_true,text_auto/more-lf-utf8bom
@@ -1,5 +1,5 @@
-lf
-lf
+lf
+lf
 crlf
-lf
-lf
+lf
+lf