Browse Source

Teach "git diff -p" HTML funcname patterns

Find lines with <h1>..<h6> tags.

[jc: while at it, reordered entries to sort alphabetically.]

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johan Herland 17 years ago committed by Junio C Hamano
parent
commit
1a1fcf4abe
  1. 2
      Documentation/gitattributes.txt
  2. 5
      diff.c

2
Documentation/gitattributes.txt

@ -322,6 +322,8 @@ patterns are available: @@ -322,6 +322,8 @@ patterns are available:

- `tex` suitable for source code for LaTeX documents.

- `html` suitable for HTML/XHTML documents.


Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5
diff.c

@ -1381,6 +1381,8 @@ static struct builtin_funcname_pattern { @@ -1381,6 +1381,8 @@ static struct builtin_funcname_pattern {
const char *name;
const char *pattern;
} builtin_funcname_pattern[] = {
{ "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
{ "html", "^\\s*\\(<[Hh][1-6]\\s.*>.*\\)$" },
{ "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
"new\\|return\\|switch\\|throw\\|while\\)\n"
"^[ ]*\\(\\([ ]*"
@ -1392,10 +1394,9 @@ static struct builtin_funcname_pattern { @@ -1392,10 +1394,9 @@ static struct builtin_funcname_pattern {
"\\|"
"^\\(.*=[ \t]*\\(class\\|record\\).*\\)$"
},
{ "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
{ "python", "^\\s*\\(\\(class\\|def\\)\\s.*\\)$" },
{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
};

static const char *diff_funcname_pattern(struct diff_filespec *one)

Loading…
Cancel
Save