diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-12-23 00:36:45 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-12-23 00:36:54 +0100 |
| commit | 32775124d1653a6cecd5bc9bda907cd146d87a06 (patch) | |
| tree | a0589db15ae8f26b5fb5167baca15b4e2d656301 /org.eclipse.jgit | |
| parent | 5db26bc399d2ff2b913867343f59e5b2d66cfab2 (diff) | |
| parent | 279eaf069004b8dca523f1ecb231c1df02ac9031 (diff) | |
| download | jgit-32775124d1653a6cecd5bc9bda907cd146d87a06.tar.gz jgit-32775124d1653a6cecd5bc9bda907cd146d87a06.zip | |
Merge branch 'stable-4.9'
* stable-4.9:
Strings#convertGlob: fix escaping of patterns like [\[].
Change-Id: I18d55537002b3153db35f8a6b60f2f5317d17248
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java | 5 |
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 4d33395d4f..9b255b41c3 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 @@ -369,7 +369,10 @@ public class Strings { case '[': if (in_brackets > 0) { - sb.append('\\').append('['); + if (!seenEscape) { + sb.append('\\'); + } + sb.append('['); ignoreLastBracket = true; } else { if (!seenEscape) { |