From owner-freebsd-git@freebsd.org Sun Dec 27 11:14:18 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 A3B314B7723 for ; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@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 4D3dNp46Pmz4TqL for ; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8D1694B7721; Sun, 27 Dec 2020 11:14:18 +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 8CE014B7A16 for ; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3dNp3VLbz4TyH; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [IPv6:2a00:1098:82:3a::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 55BCA106A; Sun, 27 Dec 2020 11:14:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [95.216.22.234]) (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 (4096 bits) client-digest SHA256) (Client CN "rincewind.trouble.is", Issuer "Let's Encrypt Authority X3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4D3dNm21kQz1dRJ; Sun, 27 Dec 2020 11:14:16 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4D3dNj6SQVz62rh; Sun, 27 Dec 2020 11:14:13 +0000 (UTC) From: "Philip Paeps" To: "Ulrich =?utf-8?q?Sp=C3=B6rlein?=" Cc: git@freebsd.org Subject: Re: git log --graph in the face of vendor imports Date: Sun, 27 Dec 2020 19:14:09 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: In-Reply-To: References: <74BD2398-30BD-442D-9658-46E6079C5C36@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit 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 11:14:18 -0000 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