aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorDmitry Pavlenko <pavlenko@tmatesoft.com>2017-12-15 21:15:35 +0100
committerDavid Pursehouse <david.pursehouse@gmail.com>2017-12-21 18:33:22 -0500
commit279eaf069004b8dca523f1ecb231c1df02ac9031 (patch)
treeb89b16a00cfc57b6b5439b557d20852c3191ac58 /org.eclipse.jgit
parent085d1f9599f6dae8fe90e2dd7df195d1c9736ec4 (diff)
downloadjgit-279eaf069004b8dca523f1ecb231c1df02ac9031.tar.gz
jgit-279eaf069004b8dca523f1ecb231c1df02ac9031.zip
Strings#convertGlob: fix escaping of patterns like [\[].
Originally the patterns were escaped twice leading to wrong matching results. Bug: 528886 Change-Id: I26e201b4b0ef51cac08f940b76f381260fa925ca Signed-off-by: Dmitry Pavlenko <pavlenko@tmatesoft.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java5
1 files changed, 4 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 79df1511d1..800cdb9952 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
@@ -363,7 +363,10 @@ public class Strings {
case '[':
if (in_brackets > 0) {
- sb.append('\\').append('[');
+ if (!seenEscape) {
+ sb.append('\\');
+ }
+ sb.append('[');
ignoreLastBracket = true;
} else {
if (!seenEscape) {