Re: gitweb using "--cc"?

Linus Torvalds [off-list ref] writes:

On Thu, 9 Feb 2006, Linus Torvalds wrote:

quoted

Here's a test-case, in case you care. Do "git-diff-tree --cc HEAD" in the 
merge-test directory.

Btw, that test-case is also designed to show the different M/A/D cases for 
the merge result. The merge diff obviously doesn't do rename/copy 
detection (I don't think it's necessarily even a well-defined op, or if 
it is, it's damn complicated).

Although I've never seriously tried it, I think "diff-tree --cc"
with -M or -C should do a decent job.  The initial phase to feed
combine-diff runs with the supplied rename/copy options if I am
not mistaken, and from the result it grabs one->{sha1,mode} (for
parent) and two->{sha1,mode} (obviously for merge result) to
feed combine-diff logic, while discarding one->path information.

So obviously it would show the final paths and would not talk
about which different path from each parent contributed to the
result, but otherwise it should not be broken too much.  At
least that was the way I intended..