Git diff gone mad?

Posted by dr Hannibal Lecter on Stack Overflow See other posts from Stack Overflow or by dr Hannibal Lecter
Published on 2010-06-08T14:48:42Z Indexed on 2010/06/08 14:52 UTC
Read the original article Hit count: 523

Filed under:

git

|

msysgit

|

tortoisegit

|

git-diff

I'm trying to figure out what's going on with my local Git repo.

I edit a file.
Git reports everything has changed in the file (I only changed one line)
At first I think "must be a newline problem", but it's not. I do a diff in TortoiseGit, everything looks fine. I do a diff with Netbeans (git plugin), everything seems fine.
I do a reset, backup the file, modify it, git again reports everything has changed.
I do a binary compare in Total Commander, the files have no differences except for the single line I changed.
I do a hard reset again. Git tells me it was done successfully. Git status still says my file has changed. I diff the thing and there are no differences - bug git says there are.

I've tried using both git bash and gui, with same results (I'm on Windows). Any clues, what's going on here?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about msysgit

msysgit - sh.exe - fork: Permission denied - Vista 64 bit

as seen on Stack Overflow - Search for 'Stack Overflow'
I installed msysgit on other Windows machines with no problems. On this Vista 64 bit Ultimate box, I installed the 3 most recent versions of msysgit. On all three installs, when I do a "git bash here", I get exactly this on the command window: sh.exe": fork: Permission denied sh.exe"-3.1$ NThe… >>> More
Setup GIT Server with Msysgit on Windows

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi Guys, My friends and I are trying to setup GIT for windows using this tutorial but we just keep running into problems. I know many of you guys on this site are GIT gurus - so I was wondering whether anyone would be able to help us (and I am sure 100s of other Windows Devs who want to use GIT)… >>> More
msysgit bash shell- how to troubleshoot "cannot find command"

as seen on Stack Overflow - Search for 'Stack Overflow'
I need help getting git extensions to run with msysgit. I have had bad luck with extensions git-tfs and git-fetchall, in both cases it is the same problem. The addon will require a file to be placed where git can find it (git-tfs.exe and git-fetchall.sh). I understand this to mean the files need… >>> More
How do I enable msysgit colored output when using console2

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm having a hard time enabling git colored output on windows when using console2. To trick git I've already SET TERM = 'cygwin'. This enabled the colors from a standard cmd.exe prompt but not in console2. I've verified that console2 can see the env var as well. Anyone know how to get this working… >>> More
Upgrade to msysgit 1.7.0.2 ?

as seen on Stack Overflow - Search for 'Stack Overflow'
I know this question is probably stoopid. But I just don't want to cause any hickups with my work system (Win7). How do I upgrade the software? Do I just replace the existing version or do I need to remove the one I'm having and then install the new version? I tried to find some info on the net but… >>> More