You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by mkautzmann <gi...@git.apache.org> on 2015/11/08 01:16:04 UTC
[GitHub] couchdb pull request: Use only unix line feeds (LF)
GitHub user mkautzmann opened a pull request:
https://github.com/apache/couchdb/pull/367
Use only unix line feeds (LF)
Hello everyone.
I really appreciate the project, great work!
When cloning the project to my local machine I noticed that one JS file is using CRLF while the rest of the project use LF.
This PR is a purpose to maintain a pattern and includes a `.gitattributes` file that helps keeping that pattern among contributors.
This is my first PR to the project. Please take a look and let me know if I got something wrong.
Thank you.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/mkautzmann/couchdb master
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/couchdb/pull/367.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #367
----
commit a918fbe81005e75d15cbaa1b4303ef7753ef741b
Author: Matheus Kautzmann <ka...@gmail.com>
Date: 2015-11-08T00:11:28Z
Use only unix line feeds (LF)
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb pull request: Use only unix line feeds (LF)
Posted by mkautzmann <gi...@git.apache.org>.
Github user mkautzmann commented on the pull request:
https://github.com/apache/couchdb/pull/367#issuecomment-155041572
Please take a look now, I've left `test/javascript/sha1.js` untouched but improved `.gitattributes`. It will use automatic conversion by default and force LF for the known text files.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb issue #367: Use only unix line feeds (LF)
Posted by wohali <gi...@git.apache.org>.
Github user wohali commented on the issue:
https://github.com/apache/couchdb/pull/367
I'm not sure how I feel about this.
Files like configure.ps1 and Makefile.win are only used on Windows machines and must contain CRLF endings. If you move them to LF only, autoconversion *must* happen or the build will fail. But the configuration of `core.autocrlf` on a Windows developer's machine could cause this to fail.
Also see the commentary here http://stackoverflow.com/questions/29435156/what-will-text-auto-eol-lf-in-gitattributes-do and especially the link to the CHANGELOG for Git 2.10.
Under your proposed change what is the _correct_ way for a Windows developer to configure their git such that a checkout will have the correct line endings, and that when they create/edit new files, that they receive the correct line endings?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb pull request: Use only unix line feeds (LF)
Posted by kxepal <gi...@git.apache.org>.
Github user kxepal commented on the pull request:
https://github.com/apache/couchdb/pull/367#issuecomment-154812619
@mkautzmann Hi! And welcome (:
Your patch is good, however, let's not modify `test/javascript/sha1.js` - as you can see in this file header, it comes from third-party work and we better have it as-is to simplify any diffs for further updates.
The `.gitattributes` needs to be extended with the other text files we have: `.ini`, `.config` etc. You can explore our project to find most of them with easy. If you need some help - please ask.
Thanks!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb pull request: Use only unix line feeds (LF)
Posted by mkautzmann <gi...@git.apache.org>.
Github user mkautzmann commented on the pull request:
https://github.com/apache/couchdb/pull/367#issuecomment-155027616
OK @kxepal. I'll check these items you mentioned and update de PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] couchdb pull request: Use only unix line feeds (LF)
Posted by kxepal <gi...@git.apache.org>.
Github user kxepal commented on the pull request:
https://github.com/apache/couchdb/pull/367#issuecomment-155076403
LGFM. @janl what would you say?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---