GNU bug report logs - #50363
[PATCH] Improve default diff hunk header detection.

Previous Next

Package: guix-patches;

Reported by: Sarah Morgensen <iskarian <at> mgsn.dev>

Date: Fri, 3 Sep 2021 22:40:01 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Maxime Devos <maximedevos <at> telenet.be>
To: Sarah Morgensen <iskarian <at> mgsn.dev>, 50363 <at> debbugs.gnu.org
Subject: [bug#50363] [PATCH v2] Improve default diff hunk header detection.
Date: Fri, 10 Sep 2021 19:07:44 +0200
[Message part 1 (text/plain, inline)]
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.
> 
> .gitattributes: New file.
> .gitconfig: New file.
> ---
> Hello Guix,
> 
> This patch improves the diff hunk headers for diffs on scheme files in this
> 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 make
> etc/committer.scm a little less brittle.
>
> The default "scheme" function regex (enabled with .gitattributes) recognizes
> both toplevel and non-toplevel defines.  I've modified the regex in .gitconfig
> to only recognize the toplevel defines.  I think this makes more sense for 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?

This seems nice to me.
 
Greetings,
Maxime.
[signature.asc (application/pgp-signature, inline)]

This bug report was last modified 3 years and 220 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.