]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rs/userdiff-multibyte-regex'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2023 21:33:35 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2023 21:33:35 +0000 (14:33 -0700)
The userdiff regexp patterns for various filetypes that are built
into the system have been updated to avoid triggering regexp errors
from UTF-8 aware regex engines.

* rs/userdiff-multibyte-regex:
  userdiff: support regexec(3) with multi-byte support

1  2 
userdiff.c
userdiff.h

diff --cc userdiff.c
index 09203fbc35453e50836e82987dc6e73466aefb27,8bb7b7a4bacee5a66a22c289784cbb0088920854..eaec6ebb5e995b726cf1e93f23d716679f2baea9
@@@ -294,8 -294,8 +296,8 @@@ PATTERNS("scheme"
         /* All other words should be delimited by spaces or parentheses */
         "|([^][)(}{[ \t])+"),
  PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
-        "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
+        "\\\\[a-zA-Z@]+|\\\\.|([a-zA-Z0-9]|[^\x01-\x7f])+"),
 -{ "default", NULL, -1, { NULL, 0 } },
 +{ "default", NULL, NULL, -1, { NULL, 0 } },
  };
  #undef PATTERNS
  #undef IPATTERN
diff --cc userdiff.h
Simple merge