From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id APGAH2mRO2FtbgAAgWs5BA (envelope-from ) for ; Fri, 10 Sep 2021 19:10:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id EDpAG2mRO2FsHAAA1q6Kng (envelope-from ) for ; Fri, 10 Sep 2021 17:10:01 +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 4848FD849 for ; Fri, 10 Sep 2021 19:10:01 +0200 (CEST) Received: from localhost ([::1]:46762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOk2K-00061k-CI for larch@yhetil.org; Fri, 10 Sep 2021 13:10:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOk0R-0002ot-9t for guix-patches@gnu.org; Fri, 10 Sep 2021 13:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOk0Q-0005Lj-Ry for guix-patches@gnu.org; Fri, 10 Sep 2021 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mOk0Q-0006pG-GX for guix-patches@gnu.org; Fri, 10 Sep 2021 13:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50363] [PATCH v2] Improve default diff hunk header detection. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Sep 2021 17:08: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 , 50363@debbugs.gnu.org Received: via spool by 50363-submit@debbugs.gnu.org id=B50363.163129367726226 (code B ref 50363); Fri, 10 Sep 2021 17:08:02 +0000 Received: (at 50363) by debbugs.gnu.org; 10 Sep 2021 17:07:57 +0000 Received: from localhost ([127.0.0.1]:39153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOk0L-0006ov-Hy for submit@debbugs.gnu.org; Fri, 10 Sep 2021 13:07:57 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:34018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOk0G-0006ok-Tf for 50363@debbugs.gnu.org; Fri, 10 Sep 2021 13:07:55 -0400 Received: from [172.20.10.4] ([188.189.169.182]) by michel.telenet-ops.be with bizsmtp id sH7q2500E3wTrX806H7qyk; Fri, 10 Sep 2021 19:07:51 +0200 Message-ID: <02da42c122f4fe839e12a3c8688cc49b140fcb12.camel@telenet.be> From: Maxime Devos Date: Fri, 10 Sep 2021 19:07:44 +0200 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-8uzmM/OQoy6a0J2W4eW/" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1631293671; bh=yNweqsFsaAgeFWh5gA2CjFpAUpOTo3zSL45wNweJo7w=; h=Subject:From:To:Date:In-Reply-To:References; b=jdWPGTZ7a+UTMrXb6wFNSiSMRVCiSVbAWsvNoHIjS5bxbt562VREOGkOvSwdtLuPl MJfDn0rdT2NrBim82Yow9BMCWkv/EtdGXSJR9qHC6EajBVCDjzn7UsozQ4IGYcSjJW f749QCGfr6/fPexs0eCYlcAoEKA471Y64A5HB6WdzlSMSThxv75n8RL7ddak/rHr22 Ehx2PJYKM3oIqoF4SslMlszbQwXAuCJQ2dIOKIKsq7NNDtFNUzh58DepmGv38d7Iwf Mohq1dXWWqymusMYz0/XBr8SXTMebXFQ8VL1QjgbgqmAZaPEA9G+408vTrob82tbkY J0G1VEQCuZXaw== 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 X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 4848FD849 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: e0r9QPAzVibI --=-8uzmM/OQoy6a0J2W4eW/ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sarah Morgensen schreef op vr 03-09-2021 om 15:39 [-0700]: > Tell git to look for top-level definitions for diff hunk headers in > Scheme files. >=20 > .gitattributes: New file. > .gitconfig: New file. > --- > Hello Guix, >=20 > 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. >=20 > 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. >=20 > Unfortunately, checked-in git config settings cannot be automatically use= d > (for security reasons), and must be enabled with a once-per-clone >=20 > git config --local include.path ../.gitconfig >=20 > which isn't ideal. I suppose we could make a 'make' target for setup lik= e > this if we wanted to make it easy. >=20 > WDYT? This seems nice to me. =20 Greetings, Maxime. --=-8uzmM/OQoy6a0J2W4eW/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYTuQ4BccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7sL+AP0XTB0DRfZieAK5bg5AOFScKtyE MKwCjiqyJC0lkYKdlwEAk0I4q/9EZC/xJ4Pc8psDAe8H9M1x+hOedOuORgnFOgU= =M7LK -----END PGP SIGNATURE----- --=-8uzmM/OQoy6a0J2W4eW/--