From 6a0ca1d4d9651c217f8d91254c772b572343ba7a Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 28 Dec 2018 14:30:59 -0500 Subject: [PATCH 1/2] Switching gitattributes to use zos-working-tree-encoding for references to EBCDIC Signed-off-by: 1000TurquoisePogs --- .gitattributes | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitattributes b/.gitattributes index e8f976258..bc6a04bb0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,10 +2,10 @@ # git's .gitattributes and .gitignore files to be encoded as EBCDIC. # Selected binary files will not be translated at all. # The default for text files -* git-encoding=iso8859-1 working-tree-encoding=ibm-1047 +* git-encoding=iso8859-1 zos-working-tree-encoding=ibm-1047 # git's files (which MUST be ASCII) -.gitattributes git-encoding=iso8859-1 working-tree-encoding=iso8859-1 -.gitignore git-encoding=iso8859-1 working-tree-encoding=iso8859-1 +.gitattributes git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1 +.gitignore git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1 # Binary files, selected by file extension. # # Note that "Binary" really just means "Not touched when moved @@ -14,8 +14,6 @@ # # If you don't have these in your tree, removing these from the # .gitattributes file will speed up git's processing a bit. -/build/env.sh git-encoding=iso8859-1 working-tree-encoding=iso8859-1 -sonar-project.properties git-encoding=iso8859-1 working-tree-encoding=iso8859-1 *.jpg git-encoding=BINARY working-tree-encoding=BINARY *.crx git-encoding=BINARY working-tree-encoding=BINARY *.eot git-encoding=BINARY working-tree-encoding=BINARY @@ -46,4 +44,7 @@ sonar-project.properties git-encoding=iso8859-1 working-tree-encoding=iso8859-1 *.woff git-encoding=BINARY working-tree-encoding=BINARY *.woff2 git-encoding=BINARY working-tree-encoding=BINARY *.zip git-encoding=BINARY working-tree-encoding=BINARY - +# Always use LF for npm package files because npm cli likes to change line endings. +package*.json text eol=lf +# sonar scanning +sonar-project.properties git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1 From fb6aed045ce27a180328aada616ef96fde17d4ef Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 28 Dec 2018 14:50:31 -0500 Subject: [PATCH 2/2] Fix for tagging the binary files on and off Z Signed-off-by: 1000TurquoisePogs --- .gitattributes | 63 ++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/.gitattributes b/.gitattributes index bc6a04bb0..2862755be 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14,36 +14,39 @@ # # If you don't have these in your tree, removing these from the # .gitattributes file will speed up git's processing a bit. -*.jpg git-encoding=BINARY working-tree-encoding=BINARY -*.crx git-encoding=BINARY working-tree-encoding=BINARY -*.eot git-encoding=BINARY working-tree-encoding=BINARY -*.fdt git-encoding=BINARY working-tree-encoding=BINARY -*.fdx git-encoding=BINARY working-tree-encoding=BINARY -*.gen git-encoding=BINARY working-tree-encoding=BINARY -*.gif git-encoding=BINARY working-tree-encoding=BINARY -*.gz git-encoding=BINARY working-tree-encoding=BINARY -*.ico git-encoding=BINARY working-tree-encoding=BINARY -*.jar git-encoding=BINARY working-tree-encoding=BINARY -*.jpg git-encoding=BINARY working-tree-encoding=BINARY -*.node git-encoding=BINARY working-tree-encoding=BINARY -*.otf git-encoding=BINARY working-tree-encoding=BINARY -*.png git-encoding=BINARY working-tree-encoding=BINARY -*.PNG git-encoding=BINARY working-tree-encoding=BINARY -*.resources git-encoding=BINARY working-tree-encoding=BINARY -*.scss git-encoding=BINARY working-tree-encoding=BINARY -*.segments_1 git-encoding=BINARY working-tree-encoding=BINARY -*.so git-encoding=BINARY working-tree-encoding=BINARY -*.svg git-encoding=BINARY working-tree-encoding=BINARY -*.swp git-encoding=BINARY working-tree-encoding=BINARY -*.tar git-encoding=BINARY working-tree-encoding=BINARY -*.tgz git-encoding=BINARY working-tree-encoding=BINARY -*.tii git-encoding=BINARY working-tree-encoding=BINARY -*.tis git-encoding=BINARY working-tree-encoding=BINARY -*.tree git-encoding=BINARY working-tree-encoding=BINARY -*.ttf git-encoding=BINARY working-tree-encoding=BINARY -*.woff git-encoding=BINARY working-tree-encoding=BINARY -*.woff2 git-encoding=BINARY working-tree-encoding=BINARY -*.zip git-encoding=BINARY working-tree-encoding=BINARY +# +# While it would make sense to have BINARY be BINARY on all platforms, +# Other platforms don't use the BINARY term, But do recognize "binary" macro +*.jpg git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.crx git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.eot git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.fdt git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.fdx git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.gen git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.gif git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.gz git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.ico git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.jar git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.jpg git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.node git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.otf git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.png git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.PNG git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.resources git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.scss git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.segments_1 git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.so git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.svg git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.swp git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.tar git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.tgz git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.tii git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.tis git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.tree git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.ttf git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.woff git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.woff2 git-encoding=BINARY zos-working-tree-encoding=BINARY binary +*.zip git-encoding=BINARY zos-working-tree-encoding=BINARY binary # Always use LF for npm package files because npm cli likes to change line endings. package*.json text eol=lf # sonar scanning