Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Dec 2020 11:23:02 +0100
From:      Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org>
To:        Philip Paeps <philip@freebsd.org>
Cc:        git@freebsd.org
Subject:   Re: git log --graph in the face of vendor imports
Message-ID:  <X%2BhghovUdhfNxXay@acme.spoerlein.net>
In-Reply-To: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org>
References:  <EE8C8A14-B828-402F-AE2C-68B3E214A1CF@freebsd.org> <X%2BcPAW2%2B1VKK1vuw@acme.spoerlein.net> <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 2020-12-27 at 09:22:59 +0800, Philip Paeps wrote:
>On 2020-12-26 18:22:57 (+0800), Ulrich Spörlein wrote:
>> On Sat, 2020-12-26 at 11:29:41 +0800, Philip Paeps wrote:
>>> I have this alias to make `git log --graph` meaningful:
>>>
>>> ```
>>> [alias]
>>>         llog = log --graph
>>> --pretty=format:'%C(yellow)%h%C(red)%d%Creset %s %C(blue)- %an,
>>> %ar%Creset'
>>> ```
>>>
>>> I noticed that in our repository, the graph shifts farther to the
>>> right
>>> with each vendor import.  Is this expected behaviour?
>>
>> Yes. Fun fact: the right combination of format flags makes git
>> segfault!
>
>Oh good.  It's not just me for once. ;-)
>
>Though I haven't managed to make it segfault yet.  I'm sure it's only a
>matter of time.
>
>I just wanted to make sure that the "drifting to the right" was
>expected.  It looks odd.
>
>Philip

log --graph is probably useless for the FreeBSD repo, as we don't have 
any other development branches other than main. Stable and co are just 
receiving cherry-picks and vendor branches don't see any "development" 
per se.

Only merges between user/projects and main would be of interest, but 
they are littered with "IFC" merges and make everything a thousand times 
worse, so I'm not recording all those IFCs as merges.

Cheers
Uli



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?X%2BhghovUdhfNxXay>