diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 14:19:02 +0900 |
| commit | b8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2 (patch) | |
| tree | 5735b27bfa71a50b3dbb95f66bcd000e5fda0f2a /userdiff.c | |
| parent | 16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b (diff) | |
| parent | 9c03caca2c40870cf7f879d18e55db1c94877cd5 (diff) | |
| download | git-b8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2.tar.gz git-b8a4e894d42dd3b1c5dfa90e68ffaee5ab27dcc2.tar.xz | |
Merge branch 'ik/userdiff-html-h-element-fix' into maint
The built-in pattern to detect the "function header" for HTML did
not match <H1>..<H6> elements without any attributes, which has
been fixed.
* ik/userdiff-html-h-element-fix:
userdiff: fix HTML hunk header regexp
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index 2c1502f71..d31466722 100644 --- a/userdiff.c +++ b/userdiff.c @@ -38,7 +38,7 @@ IPATTERN("fortran", "|//|\\*\\*|::|[/<>=]="), IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$", "[^ \t-]+"), -PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", +PATTERNS("html", "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$", "[^<>= \t]+"), PATTERNS("java", "!^[ \t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)\n" |