From: Johannes Sixt <j6t@kdbg.org>
Date: Mon, 30 Nov 2009 19:26:53 GMT
Subject: Re: equal-tree-merges as way to make rebases fast-forward-able
Message-ID: <200911302026.53933.j6t@kdbg.org>
In-Reply-To: <7v8wdnooza.fsf@alter.siamese.dyndns.org>

On Montag, 30. November 2009, Junio C Hamano wrote:
> To avoid that, I think (1) the marker has to be more reliable than just
> "happens to have the same tree", and (2) the traversal done by Porcelains
> (your patches 3 thru 5) by default should be unaware of eqt.
>
> I don't know what a suitable marker should look like, though.  The marker
> must be easily identifiable by the lowest level rev-list machinery, so it
> needs to be a sign left somewhere in the commit object.

Wouldn't the pathspec . be the marker:

    git rev-list HEAD -- .

follows only one of the branches that have identical trees.

-- Hannes