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

Use unix line-endings. #102

Closed
wants to merge 2 commits into from
Closed

Conversation

ryandub
Copy link

@ryandub ryandub commented Oct 17, 2013

Many of the files in this repo had mixed DOS and Unix line endings:

# cat -e setup.py |tail -10
    zip_safe=False,^M$
    install_requires=["gevent>=0.13", "flask>=0.8", "requests>=1.2", "msgpack-python==0.3.0"],$
    tests_require=['unittest2', 'mock', 'pyzmq'],$
    entry_points={^M$
        'console_scripts': [^M$
            'locust = locust.main:main',^M$
        ]^M$
    },^M$
    test_suite='unittest2.collector',$
)^M

This standardizes the repo on Unix line-endings. Unfortunately, Github doesn't show line endings in the diffs, so the summaries here aren't helpful.

There is also a .gitattributes file to help normalize the repo going forward using the suggestions from https://help.github.com/articles/dealing-with-line-endings.

@cgbystrom
Copy link
Member

Hi Ryan, thanks for your pull request!

Your PR is similar to an already existing issue #101
But I agree as well, using anything but Unix line endings is madness.

I think we need to bite the bullet sooner or later. But I recall @heyman being reluctant (ping).
Even with Git magic, mixing line endings can be painful and an ugly, fix-all-files commit is probably better for current and future committers.

@ryandub
Copy link
Author

ryandub commented Oct 18, 2013

Thanks for the reply. Embarrassingly, while I looked through the open pull-requests to see if someone had already submitted this, I didn't check the issues (whoops!).

@Jahaja
Copy link
Member

Jahaja commented Nov 29, 2013

Closing this as a duplicate to #101 as it can't be automatically merged. We'll probably use your .gitattributes file to make the change if we decide to do it. So thanks!

@Jahaja Jahaja closed this Nov 29, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants