Re: Suggestion: make --left-right work with --merge

From: Paul Mackerras <paulus@samba.org>
Date: Mar 1, 2008, 10:59 UTC
Message-ID: <18377.14069.25974.10203@cargo.ozlabs.ibm.com>
In-Reply-To: <7vejau6fvf.fsf@gitster.siamese.dyndns.org>

Junio C Hamano writes:

> I think your "gitk passes the IDs" part is about the master...next part in
> the above example.  I do not think it really matters if they are converted
> to object names or kept symbolic when given to "git log".

The only time it would matter is if they were kept symbolic AND somehow the user changed them between the git rev-parse (or git rev-list) invocation and the git log invocation.

> Come to think of it, when you are told to "Update", you already know the
> positive tips you can use to optimize (4), don't you?  They are the
> commits you drew in (3) that do not have children.

It's possible the user could do "Update" before we had finished reading stuff from the first git log, so I don't necessarily know all the commits that have no children. And in fact that's a reasonable thing to do if gitk is being used on a really really large repository.

I'm a kernel guy - I worry about race conditions. :)

Thanks for the tip about git rev-list --no-walk.

Paul.