Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Fix Vagrant #1840

Merged
merged 10 commits into from
Jan 7, 2014
Merged

Fix Vagrant #1840

merged 10 commits into from
Jan 7, 2014

Conversation

joeyespo
Copy link
Contributor

@joeyespo joeyespo commented Jan 6, 2014

No description provided.

Since Unix line endings are enforced now, existing Windows contributors
may have cloned the repo with autocrlf set to true and so Vagrant will
not work properly. This warning message gives instructions on how to
fix it. This also prevents confusing CRLF situations in the future.

See
- https://help.github.com/articles/dealing-with-line-endings
- http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/
- http://git-scm.com/docs/gitattributes
I had this separate because we were initially going to
set the "trust" in pg_hba.conf, which requires
knowledge of the version in the path.
@clone1018
Copy link
Contributor

Hey @joeyespo , this looks great. Are you ready for us to test?

@joeyespo
Copy link
Contributor Author

joeyespo commented Jan 6, 2014

@clone1018 thanks!

Yes, it finally builds all the way through! I'll update the README and help fix any environment-specific issues we see in another pull request.

@seanlinsley
Copy link
Contributor

Why do you want to update the README in a different pull request? It seems like that should be part of this.

@joeyespo
Copy link
Contributor Author

joeyespo commented Jan 6, 2014

@seanlinsley Really just to get .gitattributes in sooner than later so Windows users can test it without cloning this specific branch from my repo.

I probably won't get around to documenting for a few days.

@seanlinsley
Copy link
Contributor

I don't understand, how could someone possibly test your changes without cloning this branch locally?

@joeyespo
Copy link
Contributor Author

joeyespo commented Jan 6, 2014

@seanlinsley If it's pulled in, you can simply git clone. However if someone on Windows wants to test Vagrant, they'll have to do a git clone -b fix-vagrant git@github.com:joeyespo/www.gittip.com.git. Note that they can't simply clone master then switch branches because even though .gitattributes is in this branch, git won't overwrite the line endings since it doesn't think anything changed.

This is functional though. I don't think the pull request should linger because of upcoming documentation. (The README is still valid as-is. I'm simply promoting Vagrant to be part of the Quick Start with a footnote/link to the common OS-specific problems.)

@seanlinsley
Copy link
Contributor

Okay, that makes sense. I'll give this a try when I get off this train; Amtrak doesn't allow downloads of > 10 MB.

@joeyespo
Copy link
Contributor Author

joeyespo commented Jan 6, 2014

:-)

@chadwhitacre
Copy link
Contributor

My understanding is that this work for @joeyespo and almost(?) for @abnor. Can we merge this as it stands as a big improvement over our existing Vagrantfile, and reticket specific issues? I'd hate to see this PR go stale after all @joeyespo's work during the sprint.

@chadwhitacre
Copy link
Contributor

@seanlinsley Sounds like you're willing to look at this one? Let's not let perfect be the enemy of the good here. If this is a clear win over the status quo let's not hold it up unnecessarily.

@abnor
Copy link

abnor commented Jan 7, 2014

Let me know when it is pushed so I can get the latest vagrant files and let you know if it works well enough on Windows 8 or not :D

seanlinsley added a commit that referenced this pull request Jan 7, 2014
@seanlinsley seanlinsley merged commit 7437f7e into gratipay:master Jan 7, 2014
@seanlinsley
Copy link
Contributor

@abnor give it a try!

@joeyespo joeyespo deleted the fix-vagrant branch January 7, 2014 22:58
@seanlinsley
Copy link
Contributor

@abnor did you ever get Vagrant working?

@abnor
Copy link

abnor commented Jan 12, 2014

Sorry for dropping off the face of he earth. I've been using my energies to do adult people things and now I have free time again. Reenabling my virtualbox again as I had to shut it off for some installs.

@joeyespo
Copy link
Contributor Author

Hey all! Just letting you know that I opened a new issue, #1887, for further discussion of Vagrant issues. That way we don't pollute this pull request.

@abnor
Copy link

abnor commented Jan 26, 2014

Hey @joeyespo , is this where I pull the HTTPS clone?

https://github.com/joeyespo/www.gittip.com

@joeyespo
Copy link
Contributor Author

@abnor It's actually been merged in so you can grab the latest from Gittip:

https://github.com/gittip/www.gittip.com.git

@abnor
Copy link

abnor commented Jan 26, 2014

I keep getting fatal errors since it's not recognizing my git files. Will you be at the openhack tomorrow? I'll bring my computerbox and we can do this more quickly and with less me screwing things up.

@joeyespo
Copy link
Contributor Author

Interesting. Yeah I'll be there, let's figure this thing out.

@abnor
Copy link

abnor commented Jan 26, 2014

Yay~

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants