Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx> writes: > On Mon, Aug 13, 2012 at 5:02 PM, Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote: >> Can you share this repository? > > This weird behaviour doesn't even survive making a copy (cp -a) of the > whole repository, so I very much doubt making it available would be > illuminative. My disk's SMART data seems okay. The weird-quotient just > rose a bit. That sounds like an issue with stat() data, and then it doesn't. cp -a would change all the inode numbers, triggering a full refresh of the index in 'git diff'. But I'm not sure exactly how this can lead to disagreement, since both commands read *both* index and worktree version of the file. Very confusing. Can you try the following: git ls-files --debug gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net cp .git/index .git/index.orig touch gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net # note, it is important that you run diff first git diff gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net git diff-files -p gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net git ls-files --debug gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net >> Or at least the pre- and post-change >> files, transferred in such a way that there won't be any whitespace >> damage (your snippets above show obvious damage). You can use > > http://www.bpj-code.co.za/downloads.php/bugs/TwoStageAmp-output.net?text > contains the output from git show a5ee1e7. Leave off the ?text for an > application/octet-stream download. Umm, that's only one side of the diff, isn't it? The hunk header claims that the hunk goes up to line 47, so there must be more changes beyond what you showed. -- Thomas Rast trast@{inf,student}.ethz.ch -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html