Thread (158 messages) 158 messages, 7 authors, 2021-04-09

Re: [PATCH 13/20] userdiff tests + docs: document & test "diff.<driver>.x?funcname"

flat view

From: Eric Sunshine <hidden>
Date: 2021-02-15 03:17:37

On Sun, Feb 14, 2021 at 7:56 PM Ævar Arnfjörð Bjarmason
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
Add the missing documentation for "diff.<driver>.funcname" and test
for how it and "diff.<driver>.xfuncname" interact.
[...]
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
---
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
@@ -153,10 +153,22 @@ diff.<driver>.command::
+diff.<driver>.funcname::
 diff.<driver>.xfuncname::
        The regular expression that the diff driver should use to
        recognize the hunk header.  A built-in pattern may also be used.
        See linkgit:gitattributes[5] for details.
++
+When provided as `diff.<driver>.funcname` the regular expression is
+interpreted as a basic regular expression, with
This would be easier to understand: s/, with/. With/
quoted hunk ↗ jump to hunk
+`diff.<driver>.xfuncname` it's interpreted as an extended regular
+expression.
++
+
+The `*.funcname` and `*.xfuncname` variables behave as if though they
+were one configuration variable for the purposes of what value
+eventually gets used. Setting `*.funcname` will override an earlier
+`*.xfuncname` and vice-versa.
Extra blank line before this paragraph?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help