aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustaf Hendeby <hendeby@isy.liu.se>2008-08-12 16:24:26 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-12 15:43:55 -0700
commit23b5beb28fdadbb1d80ebf686a35385609f7a180 (patch)
treebd7df07da69c2bcfe8e6d9771a19b4c7eaea9b5e
parentd08ed6d692a79eb2a62410d7e76380fbf25ca793 (diff)
downloadgit-23b5beb28fdadbb1d80ebf686a35385609f7a180.tar.gz
git-23b5beb28fdadbb1d80ebf686a35385609f7a180.tar.xz
Teach git diff about BibTeX head hunk patterns
All BibTeX entries starts with an @ followed by an entry type. Since there are many entry types and own can be defined, the pattern matches legal entry type names instead of just the default types (which would be a long list). The pattern also matches strings and comments since they will also be useful to position oneself in a bib-file. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/gitattributes.txt2
-rw-r--r--diff.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index c61a58d8f..db16b0ca5 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -310,6 +310,8 @@ configuration file (you still need to enable this with the
attribute mechanism, via `.gitattributes`). The following built in
patterns are available:
+- `bibtex` suitable for files with BibTeX coded references.
+
- `java` suitable for source code in the Java lanugage.
- `pascal` suitable for source code in the Pascal/Delphi language.
diff --git a/diff.c b/diff.c
index 6954f992c..bf5d5f15a 100644
--- a/diff.c
+++ b/diff.c
@@ -1387,6 +1387,7 @@ 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\\}{.*\\)$" },
{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
};