summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-28 14:47:54 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-28 14:47:54 +0900
commit376a1da8391ee44da5cb1bffabc47c5569208ec4 (patch)
tree3d17fdea7823f32eff14cf7d5f242238237ed683 /userdiff.c
parent59373a4e03e273841c6c3b7fc9ac29c0a3e90c6d (diff)
parent9c03caca2c40870cf7f879d18e55db1c94877cd5 (diff)
downloadgit-376a1da8391ee44da5cb1bffabc47c5569208ec4.tar.gz
Merge branch 'ik/userdiff-html-h-element-fix'
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c
index 6321103ce2..dbfb4e13cd 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"