diff options
author | Marc Strapetz <marc.strapetz@syntevo.com> | 2018-02-19 11:26:09 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-27 04:24:05 -0400 |
commit | aaf71bfbcc2ec1ed62777af69c882f7d4d264497 (patch) | |
tree | 4d2153d6b67447328afba16547890e40af92308a /org.eclipse.jgit | |
parent | bcf7eb02c2ec4ba716dbad02e021668944bb4c50 (diff) | |
download | jgit-aaf71bfbcc2ec1ed62777af69c882f7d4d264497.tar.gz jgit-aaf71bfbcc2ec1ed62777af69c882f7d4d264497.zip |
gitignore/gitattributes: fix matching of \r
Patterns should treat \r in file names as normal characters
Change-Id: Ica3e0fa4a58acf5326db46bb28571fe5f20f6cd2
Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java index 9b255b41c3..41923eed18 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java @@ -443,7 +443,7 @@ public class Strings { if (in_brackets > 0) throw new InvalidPatternException("Not closed bracket?", pattern); //$NON-NLS-1$ try { - return Pattern.compile(sb.toString()); + return Pattern.compile(sb.toString(), Pattern.DOTALL); } catch (PatternSyntaxException e) { throw new InvalidPatternException( MessageFormat.format(JGitText.get().invalidIgnoreRule, |