From owner-freebsd-git@freebsd.org Sun Dec 27 10:23:11 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C7FC44B63CA for ; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3cFq5JX9z4RWg for ; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id B464F4B62EF; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B42D64B6536 for ; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3cFq3YQrz4RLy; Sun, 27 Dec 2020 10:23:11 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0BRAN2Vn063378 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 27 Dec 2020 11:23:02 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 27 Dec 2020 11:23:02 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Philip Paeps Cc: git@freebsd.org Subject: Re: git log --graph in the face of vendor imports Message-ID: References: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D3cFq3YQrz4RLy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2020 10:23:11 -0000 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