From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 09 Feb 2006 20:27:58 GMT
Subject: Re: gitweb using "--cc"?
Message-ID: <Pine.LNX.4.64.0602091216460.2458@g5.osdl.org>
In-Reply-To: <7v3bisb9qn.fsf@assigned-by-dhcp.cox.net>



On Thu, 9 Feb 2006, Junio C Hamano wrote:
>
> I was wondering if we could teach not diff_tree_combined_merge
> but show_combined_diff to do this, so that diff-files -c would
> benefit from the raw output as wel.

I wanted to do it that way, but it seemed less intrusive this way.

I agree that it is the correct thing to do, though.

> That aside, one remaining nit with your patch is printing
> p->path.  diff.c::diff_flush_raw() does something like this:
> 
> 	if (line_termination) {
> 		path_one = quote_one(path_one);
> 		path_two = quote_one(path_two);
> 	}
> 	...
> 	printf("%s%c%s", status, inter_name_termination, path_one);

Good point.

I found another nitpick: file removal doesn't seem to generate a good 
diff in "git-diff-tree --cc" (but it's correct in the new "raw" format 
diff).

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

Finally, I think it would be good to have a "--ignore-mode" flag that 
drops the mode info from the raw format (that repeating "100644" really 
isn't very interesting, and caring about mode changes is pretty rare).

		Linus

---
#!/bin/sh
rm -rf merge-test
mkdir merge-test
cd merge-test/
git-init-db 

echo "hello" > a
echo "hi there" > b
git add a b
git commit -m "Initial commit of 'a' and 'b'"
git branch other

echo "different hello" > a
git commit -m "Changed 'a'" a

git checkout other
echo "another different hello" > a
git commit -m "Changed 'a' differently" a

git checkout master
git merge "merge other" HEAD other >& /dev/null

echo "final hello" > a
rm -f b
echo "new file" > c
git-update-index --add --remove a b c
git commit -m "Evil merge"