Skip to content

Commit

Permalink
Merge pull request zowe#31 from 1000TurquoisePogs/bugfix/zos-charset-…
Browse files Browse the repository at this point in the history 
…encoding

Bugfix/zos charset encoding
  • Loading branch information
@startup-engineer
startup-engineer authored Jan 10, 2019
2 parents b92b842 + fb6aed0 commit b29c918
Showing 1 changed file with 40 additions and 36 deletions.
76 changes: 40 additions & 36 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,36 +14,40 @@
#
# 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
*.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
sonar-project.properties git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1

0 comments on commit b29c918

Please sign in to comment.