Re: [PATCH] combine-diff: add safety check to --cc.

From: Linus Torvalds <torvalds@osdl.org>
Date: Feb 3, 2006, 01:05 UTC
Message-ID: <Pine.LNX.4.64.0602021702170.3732@g5.osdl.org>
In-Reply-To: <7v64nxmhqn.fsf@assigned-by-dhcp.cox.net>

On Thu, 2 Feb 2006, Junio C Hamano wrote:

> 
> Two seconds?  You must be using CPUs/disks/memory that are lot
> faster than what I use (the kernel.org machine available to me
> seems to do it at around 3.5 wallclock seconds).  Envy, envy,...

That's not even the fastest machine I have.

However, a lot of it may be due to packing. Packed repositories tend to be a lot faster, and this was fully packed.

Show 9 quoted lines

> Two things to note.
> 
>  * Somebody said he missed "index" lines.  There is one now, but
>    I am wondering if it might be just be an added noise.  It
>    gets absolutely horrible if you run diff-tree on Len's merge.
>    On the other hand, being able to cut&paste them to "git
>    cat-file blob" command line might be handy.
> 
>    Do we want to keep it?

I don't mind it, I have no strong opinions.

Show 5 quoted lines

>  * I show the line number from the result (+1,93) and then
>    parents' line numbers (-1,87 for the first parent, -1,3 for
>    the second parent).  To be consistent with the normal ones, I
>    am thinking it might be better to move the line number for
>    the result to the last.

I think you're right. The "far off to the right" case is the unusual case, I think, and consistency is more important.

But it's certainly not a huge deal for me either.

		Linus