Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix line ending in files #150

Merged
merged 1 commit into from
Feb 3, 2017
Merged

Fix line ending in files #150

merged 1 commit into from
Feb 3, 2017

Conversation

sdague
Copy link
Contributor

@sdague sdague commented Feb 3, 2017

It looks like git on some of the developer machines wasn't set up to
do automatic line ending handling, as such a lot of litteral ^M are
checked into the respository from files that were created entirely on
Macs. When viewing these files on a Linux machine, they look all kinds
of weird because the line ending is ^J.

This creates a .gitattributes file and sets all the files with extra
^M checked into the repository to be reset to git native ^J. When
checked out locally git will do translation to the right local endings
(^M on Mac, ^M^J on Win, ^J on Linux).

It looks like git on some of the developer machines wasn't set up to
do automatic line ending handling, as such a lot of litteral ^M are
checked into the respository from files that were created entirely on
Macs. When viewing these files on a Linux machine, they look all kinds
of weird because the line ending is ^J.

This creates a .gitattributes file and sets all the files with extra
^M checked into the repository to be reset to git native ^J. When
checked out locally git will do translation to the right local endings
(^M on Mac, ^M^J on Win, ^J on Linux).
@CLAassistant
Copy link

CLAassistant commented Feb 3, 2017

CLA assistant check
All committers have signed the CLA.

@codecov-io
Copy link

codecov-io commented Feb 3, 2017

Codecov Report

Merging #150 into master will increase coverage by -3.24%.

@@            Coverage Diff             @@
##           master     #150      +/-   ##
==========================================
- Coverage    80.7%   77.47%   -3.24%     
==========================================
  Files          22       22              
  Lines         959      959              
==========================================
- Hits          774      743      -31     
- Misses        185      216      +31
Impacted Files Coverage Δ
watson_developer_cloud/init.py 100% <100%> (ø)
..._developer_cloud/natural_language_classifier_v1.py 100% <100%> (ø)
watson_developer_cloud/document_conversion_v1.py 93.75% <93.75%> (-3.13%)
watson_developer_cloud/retrieve_and_rank_v1.py 98.14% <98.14%> (ø)
watson_developer_cloud/language_translator_v2.py 44.82% <ø> (-31.04%)
..._developer_cloud/watson_developer_cloud_service.py 61.9% <ø> (-9.53%)
watson_developer_cloud/dialog_v1.py 38.88% <ø> (-5.56%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3554bde...4e80ee5. Read the comment docs.

@jsstylos
Copy link
Contributor

jsstylos commented Feb 3, 2017

Good catch, thanks for the fix!

@jsstylos jsstylos merged commit d1c4d9b into watson-developer-cloud:master Feb 3, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants