More correct pattern normalization

bozaro · Oct 29, 2016 · 433e393 · 433e393
1 parent fc26714
commit 433e393
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/git/path/WildcardHelper.java b/src/main/java/git/path/WildcardHelper.java
@@ -168,7 +168,7 @@ public static List<String> normalizePattern(@NotNull List<String> tokens) {
     // Remove tailing "**/" and "*"
     while (!tokens.isEmpty()) {
       final String token = tokens.get(tokens.size() - 1);
-      if (token.equals("**/") || token.equals("*")) {
+      if (token.equals("**/")) {
         tokens.remove(tokens.size() - 1);
       } else {
         break;

diff --git a/src/test/java/git/path/WildcardTest.java b/src/test/java/git/path/WildcardTest.java
@@ -43,8 +43,8 @@ public static Object[][] normalizePatternData() {
         // Simple mask
         new Object[]{"/", new String[0]},
         new Object[]{"*/", new String[]{"*/"}},
-        new Object[]{"*", new String[]{}},
-        new Object[]{"**", new String[]{}},
+        new Object[]{"*", new String[]{"**/", "*"}},
+        new Object[]{"**", new String[]{"**/", "*"}},
         new Object[]{"**/", new String[]{}},
         new Object[]{"foo", new String[]{"**/", "foo"}},
         new Object[]{"foo/", new String[]{"foo/"}},
@@ -67,9 +67,9 @@ public static Object[][] normalizePatternData() {
         new Object[]{"foo/**/*/**/*/**.bar", new String[]{"foo/", "*/", "*/", "**/", "*.bar"}},
 
         // Collapse trailing masks
-        new Object[]{"foo/**", new String[]{"foo/"}},
-        new Object[]{"foo/**/*", new String[]{"foo/"}},
-        new Object[]{"foo/**/*/*", new String[]{"foo/", "*/"}},
+        new Object[]{"foo/**", new String[]{"foo/", "**/", "*"}},
+        new Object[]{"foo/**/*", new String[]{"foo/", "**/", "*"}},
+        new Object[]{"foo/**/*/*", new String[]{"foo/", "*/", "**/", "*"}},
         new Object[]{"foo/**/", new String[]{"foo/"}},
         new Object[]{"foo/**/*/", new String[]{"foo/", "*/"}},
         new Object[]{"foo/**/*/*/", new String[]{"foo/", "*/", "*/"}},