From owner-freebsd-git@freebsd.org Sat Dec 26 10:23:00 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 22FD04B4C19 for ; Sat, 26 Dec 2020 10:23:00 +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 4D30J40Vp7z3Mf5 for ; Sat, 26 Dec 2020 10:23:00 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 110914B4C17; Sat, 26 Dec 2020 10:23:00 +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 10D5E4B4B9D for ; Sat, 26 Dec 2020 10:23:00 +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 4D30J35wfdz3MbT; Sat, 26 Dec 2020 10:22:59 +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 0BQAMvli005619 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 26 Dec 2020 11:22:57 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 26 Dec 2020 11:22:57 +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: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4D30J35wfdz3MbT 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: Sat, 26 Dec 2020 10:23:00 -0000 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! The history was massively streamlined to get fewer merge commits and git no longer core dumps when rendering the full thing with the proper flags. Another fun fact, we have merge commits in the repo with upwards of 6 parents or so. [alias] glog = log --graph --pretty=format:'%Cred%h %C(green)%t %Creset -%C(yellow)%d%Creset %s %Cgreen(%an, %cr, %ad)%Creset' --date=short gnlog = log --graph --pretty=format:'%Cred%h %C(green)%t %Creset %C(red)%ad %Creset-%C(yellow)%d%Creset %s %n %N %-GG' --date=short % git gnlog % git glog error: git died of signal 11 Someone™ should debug that ... Uli