summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarah Morgensen <iskarian@mgsn.dev>2021-09-20 16:37:44 -0700
committerMarius Bakke <marius@gnu.org>2021-10-14 00:24:34 +0200
commitf8b10932c86cf4c1657a67e8c484d76f757b64bd (patch)
treea2969ab2c4087eaf61d5198c5bb24c4b48b15826
parenta2c01c48aa2fe14f3138b11964d02810863db83a (diff)
Add git configuration templates to improve diff hunk header detection.
This is a follow-up to commit 9fc8ae4171e5da4939a64fc6d684c8b9d85bbe84, which missed two hunks from <https://issues.guix.gnu.org/50363>. Reported by hackeryarn on #guix. * .gitattributes, etc/git/gitconfig: New files. Signed-off-by: Marius Bakke <marius@gnu.org>
-rw-r--r--.gitattributes3
-rw-r--r--etc/git/gitconfig5
2 files changed, 8 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..b31f7fd74d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.scm diff=scheme
+*.scm.in diff=scheme
+*.texi diff=texinfo
diff --git a/etc/git/gitconfig b/etc/git/gitconfig
new file mode 100644
index 0000000000..c9ebdc8fa8
--- /dev/null
+++ b/etc/git/gitconfig
@@ -0,0 +1,5 @@
+[diff "scheme"]
+ xfuncname = "^(\\(define.*)$"
+
+[diff "texinfo"]
+ xfuncname = "^@node[[:space:]]+([^,]+).*$"