[Fixed] [7479648] zdoom.rc issue

Bugs that have been investigated and resolved somehow.

Moderator: GZDoom Developers

[7479648] zdoom.rc issue

Postby Major Cooke » Tue Oct 27, 2020 10:45 am

Due to changes to the zdoom.rc file in this commit, it keeps cropping up in my GUI and I can't get rid of it.

Here's an image.

As a result its interfering with the ability to perform some actions like merging, rebasing, and so on. Even a hard reset makes it crop up.
User avatar
Major Cooke
QZDoom Maintenance Team
 
Joined: 28 Jan 2007

Re: [7479648] zdoom.rc issue

Postby Graf Zahl » Tue Oct 27, 2020 10:51 am

Yes, it got some screwed up line endings. I got a commit fixing this on my work computer but wasn't able to oush it from the office. This is one of those things where Git truly sucks. That entire line ending fixing feature is an utter disaster because it's a client setting so anybody can commit files with bad endings and not noticing.
User avatar
Graf Zahl
Lead GZDoom+Raze Developer
Lead GZDoom+Raze Developer
 
Joined: 19 Jul 2003
Location: Germany

Re: [7479648] zdoom.rc issue

Postby Major Cooke » Tue Oct 27, 2020 10:52 am

Still better than SVN. That was a nightmare.
User avatar
Major Cooke
QZDoom Maintenance Team
 
Joined: 28 Jan 2007

Re: [7479648] zdoom.rc issue

Postby Rachael » Tue Oct 27, 2020 10:54 am

Please try this commit and let me know if it fixes anything.

Push comes to shove, do "git reset --hard" after you pull with that commit.
User avatar
Rachael
Webmaster
 
Joined: 13 Jan 2004
Discord: Rachael#3767
Twitch ID: madamerachelle
Github ID: madame-rachelle
Operating System: Windows 10/8.1/8/201x 64-bit
OS Test Version: No (Using Stable Public Version)
Graphics Processor: nVidia with Vulkan support

Re: [7479648] zdoom.rc issue

Postby Major Cooke » Tue Oct 27, 2020 11:01 am

Tried both, didn't change anything. The file still shows up.
Last edited by Major Cooke on Tue Oct 27, 2020 11:03 am, edited 1 time in total.
User avatar
Major Cooke
QZDoom Maintenance Team
 
Joined: 28 Jan 2007

Re: [7479648] zdoom.rc issue

Postby drfrag » Tue Oct 27, 2020 11:02 am

In TortoiseGitMerge ← is only CR, ↵ is CRLF and ↓ indicates LF only. I see line endings are the same as before, no problem here with the default config.
User avatar
drfrag
Os voy a romper a pedazos!
Vintage GZDoom Developer
 
Joined: 23 Apr 2004
Location: Spain
Discord: drfrag#3555
Github ID: drfrag666

Re: [7479648] zdoom.rc issue

Postby Major Cooke » Tue Oct 27, 2020 11:03 am

To be clear, I'm using SourceTree. I haven't touched anything related to that.

I'll just wait for Graf to commit his fix.
User avatar
Major Cooke
QZDoom Maintenance Team
 
Joined: 28 Jan 2007

Re: [7479648] zdoom.rc issue

Postby drfrag » Tue Oct 27, 2020 11:35 am

FWIW my config in the Git section of settings in TortoiseGit is AutoCRLF true and SafeCRLF not configured.
User avatar
drfrag
Os voy a romper a pedazos!
Vintage GZDoom Developer
 
Joined: 23 Apr 2004
Location: Spain
Discord: drfrag#3555
Github ID: drfrag666

Re: [7479648] zdoom.rc issue

Postby Graf Zahl » Tue Oct 27, 2020 11:49 am

The file defnitely has inconsistent line endings. I just pushed a fixed version.
User avatar
Graf Zahl
Lead GZDoom+Raze Developer
Lead GZDoom+Raze Developer
 
Joined: 19 Jul 2003
Location: Germany

Re: [7479648] zdoom.rc issue

Postby Rachael » Tue Oct 27, 2020 11:52 am

There's Visual Studio at its best for you...

I had to manually move the changes as it was to the old copy of zdoom.rc. I guess I am not too surprised that tainted line endings went with it.
User avatar
Rachael
Webmaster
 
Joined: 13 Jan 2004
Discord: Rachael#3767
Twitch ID: madamerachelle
Github ID: madame-rachelle
Operating System: Windows 10/8.1/8/201x 64-bit
OS Test Version: No (Using Stable Public Version)
Graphics Processor: nVidia with Vulkan support

Re: [7479648] zdoom.rc issue

Postby Graf Zahl » Tue Oct 27, 2020 12:01 pm

Have you set your Git to normalize line endings when committing?
That setting has such an utterly retarded implementation that problems are virtually inevitable, no matter what you set it to.
User avatar
Graf Zahl
Lead GZDoom+Raze Developer
Lead GZDoom+Raze Developer
 
Joined: 19 Jul 2003
Location: Germany

Re: [7479648] zdoom.rc issue

Postby Rachael » Tue Oct 27, 2020 12:16 pm

I have not done anything specific to my line-ending on commit setting, I don't even know where to change that.
User avatar
Rachael
Webmaster
 
Joined: 13 Jan 2004
Discord: Rachael#3767
Twitch ID: madamerachelle
Github ID: madame-rachelle
Operating System: Windows 10/8.1/8/201x 64-bit
OS Test Version: No (Using Stable Public Version)
Graphics Processor: nVidia with Vulkan support


Return to Closed Bugs

Who is online

Users browsing this forum: No registered users and 3 guests