Re: git diff vs git diff-files

2012-08-14 Thread Bernd Jendrissek
On Tue, Aug 14, 2012 at 11:55 AM, Thomas Rast wrote: > Fun stuff. This will be very interesting to debug. It's still > possible, though perhaps not extremely likely, that git is writing > garbage to the terminal and it just happens to work for xterm. > > Whatever you do next, *please* post the *

Re: git diff vs git diff-files

2012-08-14 Thread Andreas Schwab
Thomas Rast writes: > Whatever you do next, *please* post the *exact* file contents *and* > output in a format that does not suffer any transport damage, neither to > whitespace nor to binary data (such as terminal escapes). Piping > through xxd comes to mind, perhaps by using > > GIT_PAGER=xx

Re: git diff vs git diff-files

2012-08-14 Thread Thomas Rast
Bernd Jendrissek writes: > On Tue, Aug 14, 2012 at 10:18 AM, Thomas Rast wrote: >> 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/TwoStageAm

Re: git diff vs git diff-files

2012-08-14 Thread Bernd Jendrissek
On Tue, Aug 14, 2012 at 10:18 AM, Thomas Rast wrote: > 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 com

Re: git diff vs git diff-files

2012-08-14 Thread Thomas Rast
Bernd Jendrissek writes: > On Mon, Aug 13, 2012 at 5:02 PM, Thomas Rast 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 s

Re: git diff vs git diff-files

2012-08-13 Thread Bernd Jendrissek
On Mon, Aug 13, 2012 at 5:02 PM, Thomas Rast 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 ro

Re: git diff vs git diff-files

2012-08-13 Thread Matthieu Moy
Bernd Jendrissek writes: > $ /usr/local/git/bin/git diff-files -p --color -- TwoStageAmp-output.net > diff --git a/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net > b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net > index a5ee1e7..a9f3620 100644 > $ /usr/local/git/bin/gi

Re: git diff vs git diff-files

2012-08-13 Thread Thomas Rast
Bernd Jendrissek writes: > $ /usr/local/git/bin/git diff-files -p --color -- TwoStageAmp-output.net > diff --git a/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net > b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net > index a5ee1e7..a9f3620 100644 > --- a/gnetlist/tests/com

git diff vs git diff-files

2012-08-13 Thread Bernd Jendrissek
I have a billion testsuite golden output files that have changed due to an explicit ordering of objects I've imposed on output. A helper script I wrote to help parse the diffs (to ignore order-only differences) noticed that one hunk had a different number of additions and deletions. I'm manually co