Re: [problem with name-rev] (was: git log --graph with a sort of local revision number)

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Aug 20, 2019, 15:06 UTC
Message-ID: <20190820150631.GW20404@szeder.dev>
In-Reply-To: <87pnkzkivn.fsf_-_@mat.ucm.es>

On Tue, Aug 20, 2019 at 04:32:12PM +0200, Uwe Brauer wrote:

> Here's what I get when I start committing on master, then switch to a
> branch foo and finally merge foo into master:

Show 26 quoted lines

> *   changeset: ae68dbe:master
> |\  user:      Uwe Brauer
> | | date:      Tue Aug 20 16:25:53 2019 +0200
> | | summary:   1.2.1/1.1
> | |
> | * changeset: c00bb5d:master^2
> | | user:      Uwe Brauer
> | | date:      Tue Aug 20 16:25:53 2019 +0200
> | | summary:   1.2.1
> | |
> | * changeset: 54c9230:master^2~1
> | | user:      Uwe Brauer
> | | date:      Tue Aug 20 16:25:53 2019 +0200
> | | summary:   1.2
> | |
> * | changeset: da0712f:master~1
> |/  user:      Uwe Brauer
> |   date:      Tue Aug 20 16:25:53 2019 +0200
> |   summary:   1.1
> |
> * changeset: 8eb999d:master~2
>   user:      Uwe Brauer
>   date:      Tue Aug 20 16:25:53 2019 +0200
>   summary:   1
> 
> That looks odd.

What exactly do you think looks odd? That "master^2~1", perhaps? That's how commits on different branches are named, see 'man gitrevisions', and 'git name-rev' works as designed.