git log --graph in the face of vendor imports
Philip Paeps
philip at freebsd.org
Sun Dec 27 11:14:18 UTC 2020
On 2020-12-27 18:23:02 (+0800), Ulrich Spörlein wrote:
> 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.
I really use my 'llog' alias more as a shortcut for 'log
--pretty=oneline' than out of genuine interest in the graph. :)
> 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.
That makes sense. There's a lot of crazy stuff in our history.
Philip
--
Philip Paeps
Senior Reality Engineer
Alternative Enterprises
More information about the freebsd-git
mailing list