Re: workaround to 'git reset --hard' not working because of .gitattributes

[Richard Heck]

On 06/25/2016 08:21 PM, Scott Kostyshak wrote:
Just in case anyone else has this issue:
I keep having the following situation come up:

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

         modified:   3rdparty/hunspell/1.3.3/src/hunspell/hunspell.dsp
         modified:   
development/Win32/packaging/installer/information/WinLangCode.htm
         modified:   development/Win32/vld/src/crtmfcpatch.h
         modified:   development/Win32/vld/src/resource.h
         modified:   development/Win32/vld/src/vld.h

no changes added to commit (use "git add" and/or "git commit -a")
$

I think this is due to the recent fixes in .gitattributes. In any case,
git reset --hard does not fix anything. But the following does work for
me:

git rm .gitattributes
git add -A
git reset --hard

Thanks, Scott. I've also seen this problem though, oddly, only in some 
copies of the repo I have checked out. Playing with core.autocrlf does 
not seem to have helped, either.

Richard