1

I'm using git-tfs and I'm having issues with files changing arbitrarily.

When I run

git reset --hard

it says I'm at the appropriate commit, but that I still have pending changes. Can anyone explain what's going on here?

enter image description here

And here's my config

enter image description here

Chase Florell
  • 46,378
  • 57
  • 186
  • 376

1 Answers1

0

My guess is that this has to do with core.autocrlf changing your line endings. Have you tried with core.autocrlf=false?

You may have to delete and checkout the files again, or even try git tfs clone again from scratch with core.autocrlf=false (globally).

Anders
  • 544
  • 2
  • 8
  • I think you're right. I re-checked out the files and it doesn't seem to be happening any longer. I set autocrlf to false simply because it was recommended by [@coridrew](https://twitter.com/coridrew) in one of her meetups on git-tfs – Chase Florell Oct 23 '14 at 13:18
  • autocrlf=true has its uses, but I've found that autocrlf=false more often keeps me out of trouble when working with git-tfs. – Anders Oct 24 '14 at 14:53
  • 1
    git-tfs set locally `autocrlf=false` when cloning to avoid problems (and I think it's the better thing to do, even globally, on windows) – Philippe Oct 28 '14 at 11:13