Re: Possible bug: --ext-diff ignored with --cc in git log

From: Jeff King <peff@peff.net>
Date: Mar 11, 2016, 18:58 UTC
Message-ID: <20160311185828.GA31750@sigill.intra.peff.net>
In-Reply-To: <xmqqziu4anb9.fsf@gitster.mtv.corp.google.com>

On Fri, Mar 11, 2016 at 10:20:42AM -0800, Junio C Hamano wrote:

Show 17 quoted lines

>     diff --cc foo.sln
>     index d7ff46e,6c9aaa1..b829410
>     --- a/foo.sln
>     +++ b/foo.sln
>     @@@ 1,1 @@@
>     - d7ff46ec4a016c6ab7d233b9d4a196ecde623528  - generated file
>      -6c9aaa1ae63a2255a215c1287e38e75fcc5fc5d3  - generated file
>     ++b829410f6da0afc14353b4621d2fdf874181a9f7  - generated file
> 
> which would at least tell you that there was a merge, and if the
> merge took the full contents of the file from one of the commits and
> recorded as the result of the merge, then you wouldn't see them in
> the "--cc" output.
> 
> It happens that the above is fairly easily doable with today's Git
> without any modification.  Here is how.
> [...]

I think an even easier way is:

  git log --cc --raw

I know that is somewhat beside the point you are making, which is how we should handle "--cc" with ext-diff. But I would much rather have us show nothing for that case, and let the user turn on "--raw", than to invent a diff-looking format that does not actually represent the file contents.

-Peff