summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources
diff options
context:
space:
mode:
authorAndrey Loskutov <loskutov@gmx.de>2015-07-15 00:01:14 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2015-07-21 01:23:37 +0200
commitb98c84eb88e503e250274b62eaff000c071c62a4 (patch)
tree494a26b4dd83cd61b4e35403414b890f26f859e9 /org.eclipse.jgit/resources
parent08641ea413d64baed4ae8d017988fa15e52179ad (diff)
downloadjgit-b98c84eb88e503e250274b62eaff000c071c62a4.tar.gz
jgit-b98c84eb88e503e250274b62eaff000c071c62a4.zip
Don't crash while parsing ignore patterns
Catch unexpected PatternSyntaxException and convert it to InvalidPatternException. Log such errors, do not silently ignore them. Bug: 463581 Change-Id: Id0936d9816769ec0cfae1898beda0f7a3c146e67 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 0e0b4028b0..2398f54b05 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -328,6 +328,7 @@ invalidId=Invalid id: {0}
invalidId0=Invalid id
invalidIdLength=Invalid id length {0}; should be {1}
invalidIgnoreParamSubmodule=Found invalid ignore param for submodule {0}.
+invalidIgnoreRule=Exception caught while parsing ignore rule ''{0}''.
invalidIntegerValue=Invalid integer value: {0}.{1}={2}
invalidKey=Invalid key: {0}
invalidLineInConfigFile=Invalid line in config file