# [PATCH] Teach "git diff" HTML funcname patterns
3 messages from 2008-08-20 to 2008-08-20. Participants: Johan Herland, Mike Hommey.
Thread: https://gitlist.dev/t/15111
## Johan Herland, 2008-08-20 17:27
Subject: [PATCH] Teach "git diff" HTML funcname patterns
Message-ID: <200808201927.47099.johan@herland.net>
URL: https://gitlist.dev/e/200808201927.47099.johan%40herland.net
```
Finds lines with .. tags. The pattern is adapted from the ruby one.
Signed-off-by: Johan Herland
---
Documentation/gitattributes.txt | 2 ++
diff.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index db16b0c..8bb05e6 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -320,6 +320,8 @@ patterns are available:
- `tex` suitable for source code for LaTeX documents.
+- `html` suitable for HTML/XHTML documents.
+
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/diff.c b/diff.c
index a6c1432..13ae85d 100644
--- a/diff.c
+++ b/diff.c
@@ -1382,6 +1382,7 @@ static struct builtin_funcname_pattern {
{ "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
+ { "html", "^\\s*\\(.*\\)$" },
};
static const char *diff_funcname_pattern(struct diff_filespec *one)
--
1.6.0.96.g2fad1
```
## Mike Hommey, 2008-08-20 17:29
Subject: Re: [PATCH] Teach "git diff" HTML funcname patterns
Message-ID: <20080820172940.GA26411@glandium.org>
URL: https://gitlist.dev/e/20080820172940.GA26411%40glandium.org
In-Reply-To: <200808201927.47099.johan@herland.net>
```
On Wed, Aug 20, 2008 at 07:27:46PM +0200, Johan Herland wrote:
> Finds lines with .. tags. The pattern is adapted from the ruby one.
Don't you want to catch ... too ?
Mike
```
## Johan Herland, 2008-08-20 17:49
Subject: [PATCH v2] Teach "git diff" HTML funcname patterns
Message-ID: <200808201949.15450.johan@herland.net>
URL: https://gitlist.dev/e/200808201949.15450.johan%40herland.net
In-Reply-To: <20080820172940.GA26411@glandium.org>
```
Finds lines with .. tags. The pattern is adapted from the ruby one.
Signed-off-by: Johan Herland
---
On Wednesday 20 August 2008, Mike Hommey wrote:
> On Wed, Aug 20, 2008 at 07:27:46PM +0200, Johan Herland wrote:
> > Finds lines with .. tags. The pattern is adapted from the
> > ruby one.
> Don't you want to catch ... too ?
Yes. Thanks.
Have fun!
...Johan
Documentation/gitattributes.txt | 2 ++
diff.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index db16b0c..8bb05e6 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -320,6 +320,8 @@ patterns are available:
- `tex` suitable for source code for LaTeX documents.
+- `html` suitable for HTML/XHTML documents.
+
Performing a three-way merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/diff.c b/diff.c
index a6c1432..9d4b961 100644
--- a/diff.c
+++ b/diff.c
@@ -1382,6 +1382,7 @@ static struct builtin_funcname_pattern {
{ "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
+ { "html", "^\\s*\\(<[Hh][1-6]\\s.*>.*\\)$" },
};
static const char *diff_funcname_pattern(struct diff_filespec *one)
--
1.6.0.96.g2fad1
```