diff options
| author | Sven Strickroth <email@cs-ware.de> | 2017-01-28 17:08:59 +0100 |
|---|---|---|
| committer | Sven Strickroth <email@cs-ware.de> | 2018-04-17 19:42:09 +0200 |
| commit | f65eea4498649c5d346f1376ad605e7fb5cde013 (patch) | |
| tree | e4a9c3c30f71c2d57296b782b5198e0b90d1585e /tests/resources | |
| parent | 286a6765f8c63158938663a0cf72b0d7fe381280 (diff) | |
| download | libgit2-f65eea4498649c5d346f1376ad605e7fb5cde013.tar.gz | |
tests: crlf: update Windows test data to reflect Git 2.9+ behavior
Update with "git version 2.11.0.windows.3"
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Diffstat (limited to 'tests/resources')
35 files changed, 80 insertions, 80 deletions
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-lf index 85340755c..af6fcf6da 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-all-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr index fd2abfa9d..203555c56 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf index fd2abfa9d..aaf083a9c 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/binary-mixed-lf-cr-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr index df8c0f680..d11e7ef63 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf index df8c0f680..417786fc3 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/mixed-lf-cr-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf index e682c3077..0ff5a53f1 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom index 2e1220cbb..ea030d3c6 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-crlf-utf8bom +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf index 6da5b0c7e..04de00b35 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom index 3fa59c809..dc88e3b91 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto,eol_crlf/more-lf-utf8bom +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_false,text_auto/more-crlf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf index e682c3077..0ff5a53f1 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf +++ b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf @@ -1,5 +1,5 @@ crlf
crlf
-lf
+lf crlf
crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom index 2e1220cbb..ea030d3c6 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom +++ b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-crlf-utf8bom @@ -1,5 +1,5 @@ crlf
crlf
-lf
+lf crlf
crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf index 6da5b0c7e..04de00b35 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf +++ b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf @@ -1,5 +1,5 @@ -lf
-lf
+lf +lf crlf
-lf
-lf
+lf +lf diff --git a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom index 3fa59c809..dc88e3b91 100644 --- a/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom +++ b/tests/resources/crlf_data/windows/autocrlf_false,text_auto/more-lf-utf8bom @@ -1,5 +1,5 @@ -lf
-lf
+lf +lf crlf
-lf
-lf
+lf +lf diff --git a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-lf index 85340755c..af6fcf6da 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-all-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr index fd2abfa9d..203555c56 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf index fd2abfa9d..aaf083a9c 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/binary-mixed-lf-cr-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr index df8c0f680..d11e7ef63 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf index df8c0f680..417786fc3 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/mixed-lf-cr-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf index e682c3077..0ff5a53f1 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom index 2e1220cbb..ea030d3c6 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-crlf-utf8bom +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf index 6da5b0c7e..04de00b35 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom index 3fa59c809..dc88e3b91 100644 --- a/tests/resources/crlf_data/windows/autocrlf_input,text_auto,eol_crlf/more-lf-utf8bom +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/binary-all-lf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-all-lf index 85340755c..af6fcf6da 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-all-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr index fd2abfa9d..203555c56 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf index fd2abfa9d..aaf083a9c 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/binary-mixed-lf-cr-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr index df8c0f680..d11e7ef63 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf index df8c0f680..417786fc3 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/mixed-lf-cr-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/more-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf index e682c3077..0ff5a53f1 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom index 2e1220cbb..ea030d3c6 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-crlf-utf8bom +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/more-lf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf index 6da5b0c7e..04de00b35 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom index 3fa59c809..dc88e3b91 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto,eol_crlf/more-lf-utf8bom +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto/more-crlf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf index e682c3077..0ff5a53f1 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf +++ b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf @@ -1,5 +1,5 @@ crlf
crlf
-lf
+lf crlf
crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom index 2e1220cbb..ea030d3c6 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom +++ b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-crlf-utf8bom @@ -1,5 +1,5 @@ crlf
crlf
-lf
+lf crlf
crlf
diff --git a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf index 6da5b0c7e..04de00b35 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf +++ b/tests/resources/crlf_data/windows/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/windows/autocrlf_true,text_auto/more-lf-utf8bom b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf-utf8bom index 3fa59c809..dc88e3b91 100644 --- a/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf-utf8bom +++ b/tests/resources/crlf_data/windows/autocrlf_true,text_auto/more-lf-utf8bom @@ -1,5 +1,5 @@ -lf
-lf
+lf +lf crlf
-lf
-lf
+lf +lf |