Re: git diff vs git diff-files

From: Thomas Rast <trast@student.ethz.ch>
Date: Aug 13, 2012, 15:02 UTC
Message-ID: <87fw7qhm31.fsf@thomas.inf.ethz.ch>
In-Reply-To: <CAF7PVPrex6sJMU+uvxQOSpB12qSTp2barTycow_-LZ8Ngbv7uQ@mail.gmail.com>

Bernd Jendrissek <bernd.jendrissek@gmail.com> writes:

Show 40 quoted lines

> $ /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/common/outputs/osmond/TwoStageAmp-output.net
> +++ b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
> @@ -1,47 +1,47 @@
> -Part unknown { Name Cout }
> -Part unknown { Name R5 }
> -Part unknown { Name R4 }
> -Part unknown { Name RE2 }
> -Part unknown { Name Q2 }
> +Part unknown { Name R8 }
>  Part unknown { Name A3 }
> -Part unknown { Name R3 }
>  Part unknown { Name A2 }
> -Part unknown { Name RE1 }
>  Part unknown { Name A1 }
> [snip]
>
> $ /usr/local/git/bin/git diff TwoStageAmp-output.netdiff --git
> a/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
> b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.n
> index a5ee1e7..a9f3620 100644
> --- a/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
> +++ b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
> @@ -1,47 +1,47 @@
> -Part unknown { Name Cout }
> -Part unknown { Name R5 }
> -Part unknown { Name R4 }
> -Part unknown { Name RE2 }
> -Part unknown { Name Q2 }
> +Part unknown { Name R8 }
>  Part unknown { Name A3 }
> -Part unknown { Name R3 }
>  Part unknown { Name A2 }
> -Part unknown { Name RE1 }
> -Part unknown { Name Q1 }  <--- Not present with diff-files output
>  Part unknown { Name A1 }
> [snip]

Can you share this repository? 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

  git cat-file blob :gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net

to get at the contents of the version in the index.

Do you have any diff config that could be of interest? A textconv filter would be an obvious example that could produce the above, but perhaps you could just look at

  git config --get-regexp '.*diff.*'
  grep diff .gitattributes .git/info/attributes

etc.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch