search

r2labs / QuARC

Qualcomm Articulated Robot Control
0 stars 0 forks source link

Windows line spaces #1

Closed stormymauldin closed 9 years ago

stormymauldin commented 9 years ago

After cloning a repo in Windows, and entering the Vagrant build environment, source ./configure broke on an unexpected '\r'. This can be fixed by running dos2unix on the files from inside Vagrant.

Discuss the best place to hook this conversion in to the build process.

hershal commented 9 years ago

Seems to work for me (though I'm using Cygwin's git). Make sure your git client isn't changing the line endings on you, i.e. make sure it's set to Unix LF.

EricCrosson commented 9 years ago

Seems to me a fix that is once per-repo and not once per-client would be better. Have you experience with .gitattribute files? I have none, but this looks promising. http://stackoverflow.com/a/10855862

If we were to convert all of our files to LF only, that would look like a simple 

/**/* text eol=lf

Nixing the CR entirely is the goal, right?

Stormy: to change your client's handling of line endings, you can go to the gear icon (in the upper right corner) > Repository settings ... > Line endings and attributes.

johnathankyle commented 9 years ago

Stormy: to change your client's handling of line endings, you can go to the gear icon (in the upper right > corner) > Repository settings ... > Line endings and attributes.

Where exactly are you doing this?

EricCrosson commented 9 years ago

In his git client, i.e. the client downloaded from https://windows.github.com/

hershal commented 9 years ago

I've added the .gitattributes file. Stormy, you may have to do a git update-index --refresh after you pull the changes to see the results.

stormymauldin commented 9 years ago

Hey, just checked my email, will do this as soon as I get home!

On Jul 7, 2015, at 12:00 PM, Hershal Bhave notifications@github.com wrote:

I've added the .gitattributes file. Stormy, you may have to do a git update-index --refresh after you pull the changes to see the results.

— Reply to this email directly or view it on GitHub.

EricCrosson commented 9 years ago

Nice, hopefully this will also allow our group to edit from windows and immediately build from the repo. One interruption might appear if the .gitattributes doesn't kick in until a commit is triggered -- then we may still need to integrate a dos2unix call from inside the build() function. So long as the ./configure script sources appropriately during the beginning of the session (assuming a clean repo, this shouldn't be a problem) the addition to build() would negate this line ending problem forever.

Let's see how it works for Stormy.

stormymauldin commented 9 years ago

I just tried and I am able to run vagrant, pull, and sync normally, so I am not seeing any issues here. Was this problem something we added on here the other day?

EricCrosson commented 9 years ago

Will you edit one of the building src files from windows (add a new line or something), save it and try to build and run the tests again?

On Jul 7, 2015, at 19:07, William Mauldin notifications@github.com wrote:

I just tried and I am able to run vagrant, pull, and sync normally, so I am not seeing any issues here. Was this problem something we added on here the other day?

— Reply to this email directly or view it on GitHub.

stormymauldin commented 9 years ago

ok now im getting an permission error upon my attempt to push changes... It says I don't have access to the repo. I was able to change line ending settings though.

stormymauldin commented 9 years ago

forgive me if there is a gap in my responses, i am pretty tired and may fall asleep

hershal commented 9 years ago

Check remotes (git remote -v). If you're using https://github.com/r2labs/QuARC as your remote URL, then you must change it: git remote set-url origin ssh://git@github.com/r2labs/QuARC.

Does that help?

stormymauldin commented 9 years ago

Sorry, I fell asleep, but will try this when I get home from work!

On Jul 7, 2015, at 8:25 PM, Hershal Bhave notifications@github.com wrote:

Check remotes (git remote -v). If you're using the https://github.com/r2labs/QuARC, then you must change it: git remote set-url origin ssh://git@github.com/r2labs/QuARC.

Does that help?

— Reply to this email directly or view it on GitHub.

EricCrosson commented 9 years ago

I was able to change line ending settings though.

You only have to push this simple change if you really want to. Question, you were able to change the line endings from where? Were you required to do it manually after your edit from windows or did it "just work"?

stormymauldin commented 9 years ago

I opened up a file and edited straight from there

On Jul 8, 2015, at 7:58 AM, Eric Crosson notifications@github.com wrote:

I was able to change line ending settings though.

You only have to push this simple change if you really want to. Question, you were able to change the line endings from where? Were you required to do it manually after your edit from windows or did it "just work"?

— Reply to this email directly or view it on GitHub.

stormymauldin commented 9 years ago

This is the error I am getting. I made sure the URL was correct, but to no avail. error

hershal commented 9 years ago

You need to accept the invitation to join the r2labs group. See if you have any unread GitHub notifications.

stormymauldin commented 9 years ago

I don't have any notifications in my inbox, and it even says that I am a member of r2labs. Any other ideas?

stormymauldin commented 9 years ago

I'M IN! Thanks man!