threads / discuss / 4477

git-diff --cc broken in 1.4.0?

Subject: git-diff --cc broken in 1.4.0?

## tl;dr

3 messages between Jun 12, 2006 and Jun 14, 2006.

replies: 2people: 2as markdown or json

Martin Langhoff· Jun 12, 2006, 04:32 UTC · lore

I was looking at some merges in gitk and lamenting the apparent loss of the nice two-sided diff we get with -cc, and now duting a slightly messy merge I did git-diff -cc only to get...

$ git-ls-files --unmerged 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1 local/version.php 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2 local/version.php 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3 local/version.php

$ git-diff --cc diff --cc local/version.php index 9352efa,50da9b4..0000000

--- a/local/version.php
+++ b/local/version.php

cheers,


martin

Junio C Hamano· Jun 14, 2006, 20:32 UTC · re: Martin Langhoff · lore

Re: git-diff --cc broken in 1.4.0?

"Martin Langhoff" <martin.langhoff@gmail.com> writes:

> I was looking at some merges in gitk and lamenting the apparent loss
> of the nice two-sided diff we get with -cc, and now duting a slightly
> messy merge I did git-diff -cc only to get...

This not a regression that I know of in 1.4.0; mind showing the stage 2 and 3 blobs and the file in the resolution result (I do not need stage 1)?

One thing to note is that --cc does not show a hunk in which you take only from one side.

Show 5 quoted lines

>
> $ git-ls-files --unmerged
> 100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1       local/version.php
> 100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2       local/version.php
> 100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3       local/version.php

Martin Langhoff· Jun 14, 2006, 20:58 UTC · re: Junio C Hamano · lore

Re: git-diff --cc broken in 1.4.0?

On 6/15/06, Junio C Hamano <junkio@cox.net> wrote:

> One thing to note is that --cc does not show a hunk in which you
> take only from one side.

Must have been that. I was looking at a big (but clean) merge, and where gitk used to show a large-ish diff there was nothing. I somehow expected an even larger diff with the changes against both sides.

thanks for the clarification and sorry about that!