Very strange issue with git; local changes to file?

Need help running G/Q/ZDoom/ECWolf/Zandronum/3DGE/EDuke32/Raze? Did your computer break? Ask here.

Moderator: GZDoom Developers

Forum rules
Contrary to popular belief, we are not all-knowing-all-seeing magical beings!

If you want help you're going to have to provide lots of info. Like what is your hardware, what is your operating system, what version of GZDoom/LZDoom/whatever you're using, what mods you're loading, how you're loading it, what you've already tried for fixing the problem, and anything else that is even remotely relevant to the problem.

We can't magically figure out what it is if you're going to be vague, and if we feel like you're just wasting our time with guessing games we will act like that's what you're really doing and won't help you.
TiZ
Posts: 4
Joined: Mon Feb 27, 2017 8:17 pm

Very strange issue with git; local changes to file?

Post by TiZ »

Hiya. Just trying to do a local build of GZDoom on my Linux box that I can carry between distros. But I'm running into something weird trying to check out the tag for the latest stable release. I've cloned from git://github.com/coelckers/gzdoom.git, and when I try to checkout the tag, I get this:

Code: Select all

error: Your local changes to the following files would be overwritten by checkout:
	src/win32/zdoom.rc
Please, commit your changes or stash them before you can switch branches.
Aborting
This is even when I do git reset --hard followed by git clean -ffdx before trying to checkout. What is this file? What's its deal? Why won't git actually revert it?

I can get around it by doing git reset --hard $tag, but I thought I'd at least stop by and report it here in case it means there might actually be something wrong with the git state.
Top
_mental_
 
 
Posts: 3808
Joined: Sun Aug 07, 2011 4:32 am

Re: Very strange issue with git; local changes to file?

Post by _mental_ »

In general, you can safely ignore this. It's caused by difference in line ending on Windows and other OSes, i.e. CR/LF vs. just LF.

To handle such things properly .rc extension should be added to .gitattributes file.
This won't help for already existing commits though, when someone needs to checkout one of them, like in your case.
Top

Return to “Technical Issues”