CRLF change issues

Post Reply
User avatar
tagban
Posts: 352
Joined: Fri Dec 28, 2012 11:31 am
Location: Pennsylvania, USA

CRLF change issues

Post by tagban » Thu Jan 14, 2016 5:28 am

After the change it flagged an error and wouldn't let me stash pop my mods I made
Figured this was my fault sonindid a clean pull after deleting my old stuff. Remodded my files and called it good. We had a crash so I re stashed my stuff and repulled. Gave me errors again about changing the files back, but since I assumed they already were modified at this point tried it anyway. Pop failed again.

Getting a little frustrated so tried just grabbing another new fresh clone. And immediately did a stash save. (No mods this time) errored basically tried to stash everything despite no changes made.

At this point incant get my server back up until I can fix this. Spent around 2 hours hand editing my changes into lua files, config files, and my server chat mod. None of which should break thebgit stash and pop functions

Is there a work around or a way I can turn off the crlf setting sonit stays as it was?

User avatar
demolish
Developer
Posts: 262
Joined: Thu Jul 26, 2012 7:12 am

Re: CRLF change issues

Post by demolish » Thu Jan 14, 2016 4:05 pm

tried just committing the changes?
<Giblet[NewBrain]> kj with this first step would be fine on my shit
Click here for a guide on scripting missions.

User avatar
tagban
Posts: 352
Joined: Fri Dec 28, 2012 11:31 am
Location: Pennsylvania, USA

Re: CRLF change issues

Post by tagban » Thu Jan 14, 2016 5:00 pm

I wasn't sure what to do there but when I tried to STASH POP it just broke and said "F You"... So I got frustrated and made a new pull (Clean download) and kept having hte same issue figured it might be something weird. So I should hit the "Commit" button?

User avatar
TeoTwawki
Developer
Posts: 527
Joined: Mon Jul 15, 2013 9:50 pm

Re: CRLF change issues

Post by TeoTwawki » Fri Jan 15, 2016 10:19 am

on a fresh clone, BEFORE changing any files, you have an error?
Hi, I run The Demiurge server.


Image
Always code as if the guy who ends up maintaining your code will be a violent psychopath who knows where you live. - Martin Golding
PLS USE [ code ] CODE TAGS [ /code ] WHEN POSTING CODE
DO NOT PRIVATE MESSAGE ME ABOUT BUGS

User avatar
tagban
Posts: 352
Joined: Fri Dec 28, 2012 11:31 am
Location: Pennsylvania, USA

Re: CRLF change issues

Post by tagban » Fri Jan 15, 2016 11:37 am

So if I do a fresh clone, and hit "Stash Save just to test, it basically finds EVERY single file, and marks that they won't work or something due to CRLF or something. I assume by "Commit" you want me to hit the commit button after pulling?

User avatar
tagban
Posts: 352
Joined: Fri Dec 28, 2012 11:31 am
Location: Pennsylvania, USA

Re: CRLF change issues

Post by tagban » Fri Jan 15, 2016 8:11 pm

Thanks to Teo I have a handle on what was causing my issues. I did however uncover several files that still need converted to LF from Master

https://anotepad.com/notes/jymi6e

Cheers!

User avatar
tagban
Posts: 352
Joined: Fri Dec 28, 2012 11:31 am
Location: Pennsylvania, USA

Re: CRLF change issues

Post by tagban » Sat Jan 16, 2016 5:51 pm

Thanks Teo and Kj!!! :) All fixed.

Post Reply