Date: Sun, 27 Dec 2020 19:14:09 +0800 From: "Philip Paeps" <philip@freebsd.org> To: "Ulrich =?utf-8?q?Sp=C3=B6rlein?=" <uqs@freebsd.org> Cc: git@freebsd.org Subject: Re: git log --graph in the face of vendor imports Message-ID: <ADBBBC82-908A-479D-93C6-636547CF384E@freebsd.org> In-Reply-To: <X%2BhghovUdhfNxXay@acme.spoerlein.net> References: <EE8C8A14-B828-402F-AE2C-68B3E214A1CF@freebsd.org> <X%2BcPAW2%2B1VKK1vuw@acme.spoerlein.net> <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> <X%2BhghovUdhfNxXay@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ADBBBC82-908A-479D-93C6-636547CF384E>