From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MMlhLDBkt2ExVQEAgWs5BA (envelope-from ) for ; Mon, 13 Dec 2021 16:18:08 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IJD/JzBkt2F5UwAAB5/wlQ (envelope-from ) for ; Mon, 13 Dec 2021 15:18:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7336CBBB1 for ; Mon, 13 Dec 2021 16:18:08 +0100 (CET) Received: from localhost ([::1]:39900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwn5b-0005zh-0O for larch@yhetil.org; Mon, 13 Dec 2021 10:18:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwn4r-0005UP-Qw for guix-devel@gnu.org; Mon, 13 Dec 2021 10:17:23 -0500 Received: from [2001:aa8:ffed:f5f3::151] (port=59450 helo=mail1.fsfe.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwn4p-0006rx-3b; Mon, 13 Dec 2021 10:17:21 -0500 From: Jelle Licht DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1639408634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d9kzO8y1QhzYCnbzmGqXakQy1UuejuOW+MPRg5BHkq4=; b=VA7uKMoBQ13G2J6F5Aa6/UHYLo7H35YCAs36MqHmHNC8uEewekbcorha3tGcEd3uUgYSbP Sh7XZCwm9oEjPnXfq5dQRL3vtFvgq6xHOzr2Q2N9oBku6hK6qBEOBXuKreiv5T6Q3tPYiw rQ35KKiExrq20FTX6of3uosoWcl15sk= To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: Flag day for simplified package inputs In-Reply-To: <87ilw8z02c.fsf@gnu.org> References: <87k0h4i3io.fsf@gnu.org> <86o86gjh8t.fsf@fsfe.org> <87o86cnx4k.fsf@gnu.org> <861r38cjf5.fsf@fsfe.org> <87v90iiyuo.fsf@gnu.org> <86ilwb9o65.fsf@fsfe.org> <87ilw8z02c.fsf@gnu.org> Date: Mon, 13 Dec 2021 16:17:13 +0100 Message-ID: <865yrsa612.fsf@fsfe.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2001:aa8:ffed:f5f3::151 (failed) Received-SPF: pass client-ip=2001:aa8:ffed:f5f3::151; envelope-from=jlicht@fsfe.org; helo=mail1.fsfe.org X-Spam_score_int: -62 X-Spam_score: -6.3 X-Spam_bar: ------ X-Spam_report: (-6.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_HI=-5, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guix Devel Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639408688; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=d9kzO8y1QhzYCnbzmGqXakQy1UuejuOW+MPRg5BHkq4=; b=pU4Pme33kW0w6TV+mvTaZEj7snPG15KXm+Z5Eg6qYcFjeCNzA7qE/GRs/2om7VHb6z3gFq KxrLx5NyrbkgIhbk3wR60MLcwOHlf2/vkzLq60yVNdjnrQXv/lxTnYaBZzeCLnaatYC9RN hnR8KrMgBVNneDCKzVmqzjqqXN0MZ/MynbXX9eLTroWTXlfmWUTN4Vtu1t8UJntqM9lB0C zXuML+CL9t4bMSZIJgm0FN2yxqjbkwP4suhZQ09pTz1BAtQ2OPShM5Fw9wr8no9adwsets Oy6wx/hV6u8o+dD9tLqRRibRkvw9AJz7X64TaMtGWsiAZGr2F2zihgwYv28hKg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639408688; a=rsa-sha256; cv=none; b=nWH7Iop0fVR68lSMI/aZa1pd5zAZi+QFsFosLAwaRWKXYw1CKIthv/nLOdHc4qXX6e1Z7X Q/JPPI1F7eAj2X1oC+MJvTcENxXDL0DDHQ0Kz78/RNoajMTG5YTi6JFeahMtsE88h/fkre zK6a7kpo7/jJBZDDNj8MeDKHcnalKlQpkVMVs6y94N3arYsEdx+KOnUNedTWaOwaKvVNIu XymIUll3gJPUJofRd9TbCulFJsIcjrwQCfVrCbWbAYLqTnJifuYE3IsZYBp+HmoIiXvJFD g32zzJyVg8UMoY4Mgjf1nwBinLaUW8Ut/c0YeIJTr4GUfr/PYWO8kOCxaaz0Vw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=fsfe.org header.s=2021100501 header.b=VA7uKMoB; dmarc=pass (policy=none) header.from=fsfe.org; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -7.67 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=fsfe.org header.s=2021100501 header.b=VA7uKMoB; dmarc=pass (policy=none) header.from=fsfe.org; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7336CBBB1 X-Spam-Score: -7.67 X-Migadu-Scanner: scn1.migadu.com X-TUID: 7yiS63PW/N7X --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, Ludovic Court=C3=A8s writes: > Hi, > > Jelle Licht skribis: > >> I will work on that. Do we already have a suitable 'bulk change' in the >> repo? Or should we first run `guix style', and subsequently use that >> commit as the first entry in the .git-blame-ignore-revs file? > > The latter I guess. Attached what I was thinking of: I decided to go with integrating the git-blame-ignore-revs file with our existing gitconfig situation. Let me know what you think of the workflow and the documented changes after running `guix style'. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-maint-Ignore-specified-bulk-changes-in-git-blame.patch >From 69926c94fb576e503d7838836cfd83066c39abcc Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 13 Dec 2021 16:08:22 +0100 Subject: [PATCH] maint: Ignore specified bulk changes in git blame. * etc/git/git-blame-ignore-revs: New file. * etc/git/gitconfig (blame): Add ignoreRevsFile. * doc/guix.texi ("Invoking guix style"): Document git-blame-ignore-revs usage. Signed-off-by: Jelle Licht --- doc/guix.texi | 5 +++++ etc/git/git-blame-ignore-revs | 0 etc/git/gitconfig | 3 +++ 3 files changed, 8 insertions(+) create mode 100644 etc/git/git-blame-ignore-revs diff --git a/doc/guix.texi b/doc/guix.texi index 59651f996b..0c0293cc8e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12769,6 +12769,11 @@ Invoking guix style trigger any package rebuild. @end table +When applying automated changes to many packages, consider adding that +particular commit hash to @file{etc/git/git-blame-ignore-revs} in a +follow-up commit. This will allow @command{git blame} +(@pxref{Configuring Git}) to automatically ignore the specified commits. + @node Invoking guix lint @section Invoking @command{guix lint} diff --git a/etc/git/git-blame-ignore-revs b/etc/git/git-blame-ignore-revs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/etc/git/gitconfig b/etc/git/gitconfig index c9ebdc8fa8..afa598c4e3 100644 --- a/etc/git/gitconfig +++ b/etc/git/gitconfig @@ -1,3 +1,6 @@ +[blame] + ignoreRevsFile = etc/git/git-blame-ignore-revs + [diff "scheme"] xfuncname = "^(\\(define.*)$" base-commit: e765ad091d861c99eae9fdd402214a2e2e90ed4d -- 2.34.0 --=-=-= Content-Type: text/plain - Jelle --=-=-=--