From f7cc1058c74129ad9ed75b8dd925fd432afc4497 Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Tue, 27 Jun 2017 23:25:01 +0300 Subject: [PATCH 1/3] Fix 'CR' issue on Linux based OS. Signed-off-by: Oleksandr Andriienko --- .gitattributes | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.gitattributes b/.gitattributes index 6313b56c..1af12db2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,18 @@ * text=auto eol=lf +logo.png binary +src/test/escape_sequence_files/t0005-CR.in eol=cr +src/test/escape_sequence_files/t0011-RI_scroll.in eol=cr +src/test/escape_sequence_files/t0014-CAN.in eol=cr +src/test/escape_sequence_files/t0015-SUB.in eol=cr +src/test/escape_sequence_files/t0023-CUU_scroll.in eol=cr +src/test/escape_sequence_files/t0024-CUD.in eol=cr +src/test/escape_sequence_files/t0026-CNL.in eol=cr +src/test/escape_sequence_files/t0033-VPB_scroll.in eol=cr +src/test/escape_sequence_files/t0034-VPR.in eol=cr +src/test/escape_sequence_files/t0051-IL.in eol=cr +src/test/escape_sequence_files/t0052-DL.in eol=cr +src/test/escape_sequence_files/t0073-DECSTBM_RI.in eol=cr +src/test/escape_sequence_files/t0101-NLM.in eol=cr +src/test/escape_sequence_files/t0500-bash_long_line.in eol=cr +src/test/escape_sequence_files/t0503-zsh_ls_color.in eol=cr +src/test/escape_sequence_files/t0504-vim.in eol=cr From 5971630f640dcec19a8ea31f56974d4c0887ff07 Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Wed, 28 Jun 2017 00:39:16 +0300 Subject: [PATCH 2/3] Simplify .gitattributes Signed-off-by: Oleksandr Andriienko --- .gitattributes | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1af12db2..ff217a36 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,18 +1,3 @@ * text=auto eol=lf logo.png binary -src/test/escape_sequence_files/t0005-CR.in eol=cr -src/test/escape_sequence_files/t0011-RI_scroll.in eol=cr -src/test/escape_sequence_files/t0014-CAN.in eol=cr -src/test/escape_sequence_files/t0015-SUB.in eol=cr -src/test/escape_sequence_files/t0023-CUU_scroll.in eol=cr -src/test/escape_sequence_files/t0024-CUD.in eol=cr -src/test/escape_sequence_files/t0026-CNL.in eol=cr -src/test/escape_sequence_files/t0033-VPB_scroll.in eol=cr -src/test/escape_sequence_files/t0034-VPR.in eol=cr -src/test/escape_sequence_files/t0051-IL.in eol=cr -src/test/escape_sequence_files/t0052-DL.in eol=cr -src/test/escape_sequence_files/t0073-DECSTBM_RI.in eol=cr -src/test/escape_sequence_files/t0101-NLM.in eol=cr -src/test/escape_sequence_files/t0500-bash_long_line.in eol=cr -src/test/escape_sequence_files/t0503-zsh_ls_color.in eol=cr -src/test/escape_sequence_files/t0504-vim.in eol=cr +src/test/escape_sequence_files/* binary From 467e8c563abf91aee16b7c707005a2a86bc6676c Mon Sep 17 00:00:00 2001 From: Oleksandr Andriienko Date: Wed, 28 Jun 2017 00:48:13 +0300 Subject: [PATCH 3/3] Fix up. --- .gitattributes | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitattributes b/.gitattributes index ff217a36..176a458f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1 @@ -* text=auto eol=lf -logo.png binary -src/test/escape_sequence_files/* binary +* text=auto