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 oMn+DyUoP2GfVgEAgWs5BA (envelope-from ) for ; Mon, 13 Sep 2021 12:29:57 +0200 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 IGyzCyUoP2HTfAAAB5/wlQ (envelope-from ) for ; Mon, 13 Sep 2021 10:29:57 +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 9483516508 for ; Mon, 13 Sep 2021 12:29:56 +0200 (CEST) Received: from localhost ([::1]:52898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPjDn-0007aZ-JC for larch@yhetil.org; Mon, 13 Sep 2021 06:29:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPj95-0005L9-Su for guix-patches@gnu.org; Mon, 13 Sep 2021 06:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPj94-0001pl-H8 for guix-patches@gnu.org; Mon, 13 Sep 2021 06:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mPj94-0000zW-Cg for guix-patches@gnu.org; Mon, 13 Sep 2021 06:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50363] [PATCH] Improve default diff hunk header detection. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Sep 2021 10:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50363 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sarah Morgensen Cc: 50363@debbugs.gnu.org Received: via spool by 50363-submit@debbugs.gnu.org id=B50363.16315286763753 (code B ref 50363); Mon, 13 Sep 2021 10:25:02 +0000 Received: (at 50363) by debbugs.gnu.org; 13 Sep 2021 10:24:36 +0000 Received: from localhost ([127.0.0.1]:44450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPj8d-0000yT-UE for submit@debbugs.gnu.org; Mon, 13 Sep 2021 06:24:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPj8c-0000yE-4T for 50363@debbugs.gnu.org; Mon, 13 Sep 2021 06:24:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:60114) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPj8W-0001OF-Rc; Mon, 13 Sep 2021 06:24:28 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=47250 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPj8W-00013n-It; Mon, 13 Sep 2021 06:24:28 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Mon, 13 Sep 2021 12:24:25 +0200 In-Reply-To: (Sarah Morgensen's message of "Fri, 3 Sep 2021 15:39:05 -0700") Message-ID: <87czpcai3q.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631528997; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=tgV1HtKvR7wD0ytqLS6B09JhpTAQSPcbERIGKDPQtjg=; b=ZXZy+WDZb3FaqZ56mCdBaInLgD9/zZ9hC26lGLNKY6cbgYFtpEQjtBKYYLn1Vp8QZimCmU 9I+H6CMAVHu3jkCvtd/9040HHNWiyrYytCCAW2lpubq0/sBnJY0Bp5yDStdKTdokLEtN7Z 9qgl9cqgYIkLSplUEW29ZanwpcN5LeWpmXwzoC7YJzWHgY8sIUGBO6bskRV3YylQOhmxYE HUqtDAdmOBZPmUCD6xI7tCGgjQhKG3pY+fTQgwIJvBJD9g2/FeTmUL31fR0q8ohn8HcGlA apgwC8SxF71Lw35YHgJLGy65R1Owg9qzbVDiufMheNjjiDlUtGOpzxT1YSz2Ig== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631528997; a=rsa-sha256; cv=none; b=CP04gCxanhNXL4LLFJCC+x7skSJJH0sjqtQtEsrlzh+1Bjj0DCn1qjbC+wiMxxuUp9N1vf Fh94hBz5dA/fy7DD0yQFaGFACEAxqUXTKf+Q6ja+udOFp9pTec3Sodp/8xLydOw38BenUi 8jVstB9NzmkAC4WiDqg2RwEW8VOLCrBDIPROJ2g+uZXdoZ5XgFMU34Bf2l0rW9PRFjpzsy JV6UVRsxsiZcimVw4yFsuN27c+wunMhPWdNuKZyHYQUuEnuagj+no4AYT4AqqQDnutawSc 30Y2OXbKPAO5c2H26XOjhzyi5Ph7bipwFFNGGfqdzma+HSmMuY1EqMl4Hc/HpQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.40 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 9483516508 X-Spam-Score: -1.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: YL2WqfsHDh1B Hi! Sarah Morgensen skribis: > Tell git to look for top-level definitions for diff hunk headers in > Scheme files. > > .gitattributes: New file. > .gitconfig: New file. > --- > Hello Guix, > > This patch improves the diff hunk headers for diffs on scheme files in th= is > repository. These settings are always settable (and overridable) on a > per-user basis, but I think having them as defaults is nice. > > This may help with patches applying in general, but the main goal is to m= ake > etc/committer.scm a little less brittle. > > The default "scheme" function regex (enabled with .gitattributes) recogni= zes > both toplevel and non-toplevel defines. I've modified the regex in .gitc= onfig > to only recognize the toplevel defines. I think this makes more sense fo= r our > purposes. > > Unfortunately, checked-in git config settings cannot be automatically used > (for security reasons), and must be enabled with a once-per-clone > > git config --local include.path ../.gitconfig > > which isn't ideal. I suppose we could make a 'make' target for setup like > this if we wanted to make it easy. > > WDYT? That LGTM too. Rather than a =E2=80=98make=E2=80=99 target, how about a ad= ding a line or two under =E2=80=9CContributing=E2=80=9D? Thanks, Ludo=E2=80=99.