From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0ElSL0a1R2FLigAAgWs5BA (envelope-from ) for ; Mon, 20 Sep 2021 00:10:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4OHvKka1R2EueQAAB5/wlQ (envelope-from ) for ; Sun, 19 Sep 2021 22:10:14 +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 883BD1B081 for ; Mon, 20 Sep 2021 00:10:14 +0200 (CEST) Received: from localhost ([::1]:33452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mS50m-0000NZ-P2 for larch@yhetil.org; Sun, 19 Sep 2021 18:10:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mS50c-0000NP-Lc for guix-patches@gnu.org; Sun, 19 Sep 2021 18:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mS50c-0007uk-9b for guix-patches@gnu.org; Sun, 19 Sep 2021 18:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mS50b-00036D-QA for guix-patches@gnu.org; Sun, 19 Sep 2021 18:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50363] [PATCH v3] Improve default diff hunk header detection. Resent-From: Kyle Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Sep 2021 22:10:01 +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, ludo@gnu.org, maximedevos@telenet.be Received: via spool by 50363-submit@debbugs.gnu.org id=B50363.163208940111903 (code B ref 50363); Sun, 19 Sep 2021 22:10:01 +0000 Received: (at 50363) by debbugs.gnu.org; 19 Sep 2021 22:10:01 +0000 Received: from localhost ([127.0.0.1]:40183 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS50a-00035v-MX for submit@debbugs.gnu.org; Sun, 19 Sep 2021 18:10:00 -0400 Received: from out2.migadu.com ([188.165.223.204]:21500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mS50X-00035l-QW for 50363@debbugs.gnu.org; Sun, 19 Sep 2021 18:09:59 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1632089396; 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=aaXyqbT6c8vz6tWswZjAJvtGEqpHhaFHI9BwCKx12AE=; b=ezsVH36c8VwIuHw4P8Pzb5zKp0Pytm8AwWpihc06W3Qa5XciBsTEY+Av3W68IXgXFxHCCC f6PPCQ4MVst9H4BG0L9rWwEdCJdgFxR/reIyndbH174G5jOZuMu0C7d4X7QJ2qzG/cXmO5 PxMecyJ0CRe+0dBchlv8a44qsCO+ItxprK2WcySIWSk5MaG7RAya8PMS2h/WFvtlbXME2r BSBim+LCLZVyey+sCVJsKaD3Db39jyt4HTBWWYDhZpDmLO9yRjR0z8Ul+UIdgUApl73k5z RaBUZJCsAiiABVuPItJ+uK3DFJvKON7EbLm69shnTQju7HAIy+ghduPIo3CsIg== From: Kyle Meyer In-Reply-To: <58187bb9c61bc7599cde31b52a5dd58e90c1f78f.1632076068.git.iskarian@mgsn.dev> References: <58187bb9c61bc7599cde31b52a5dd58e90c1f78f.1632076068.git.iskarian@mgsn.dev> Date: Sun, 19 Sep 2021 18:09:47 -0400 Message-ID: <87o88o8bf8.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain 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: 883BD1B081 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: rSy1UhZYm6sa Sarah Morgensen writes: > diff --git a/.gitattributes b/.gitattributes > new file mode 100644 > index 0000000000..51f29b8a48 > --- /dev/null > +++ b/.gitattributes > @@ -0,0 +1,3 @@ > +*.scm diff=scheme > +*.scm.in diff=scheme > +*.texi diff=tex "tex" is a built-in pattern for LaTeX. To avoid confusion, I suggest "texinfo", which is what the Emacs repo uses. > diff --git a/doc/contributing.texi b/doc/contributing.texi [...] > +@example > +git config --local include.path=../etc/git/gitconfig > +@end example The '=' above should be a space: $ git config --local include.path=../etc/git/gitconfig error: invalid key: include.path=../etc/git/gitconfig (This is true in the other examples as well.) Just thinking aloud: the include.path approach above assumes a clone with the standard $GIT_DIR and working tree layout, but that seems fine because users with more unusual setups would know how to adjust it for their case. Also, for git-worktree users, the etc/git/gitconfig file in the main worktree would be used within other worktrees, but for this use case I doubt that will cause confusion. > @unnumberedsubsec Sending a Patch Series > @anchor{Sending a Patch Series} > @cindex patch series > @cindex @code{git send-email} > -@cindex @code{git-send-email} I suspect the second variant was included to help those that are using the git- variant to search (perhaps because that's how they'd refer to the manpage or because they know about Git's exec path). Not a big deal either way, but keeping it around seems okay to me. > diff --git a/etc/git/gitconfig b/etc/git/gitconfig > new file mode 100644 > index 0000000000..290006816f > --- /dev/null > +++ b/etc/git/gitconfig > @@ -0,0 +1,5 @@ > +[diff "scheme"] > + xfuncname = "^(\\(define.*)$" > + > +[diff "tex"] > + xfuncname = "^(@((|sub|subsub)section|(unnumbered|appendix)((|sub|subsub)sec)|(|major|chap|sub|subsub)heading|chapter|part|titlepage|top)[ \t]+.*)$" Fwiw the Emacs repo sets a simpler value (via autogen.sh): ^@node[[:space:]]+([^,[:space:]][^,]+)