Trim globs loaded from file

bozaro · Oct 14, 2016 · b76ab37 · b76ab37
1 parent 3bd44e4
commit b76ab37
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/git/lfs/migrate/Main.java b/src/main/java/git/lfs/migrate/Main.java
@@ -35,11 +35,11 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.GeneralSecurityException;
 import java.util.*;
-import java.util.stream.Stream;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
 
 /**
  * Entry point.
@@ -78,9 +78,11 @@ public static void main(@NotNull String[] args) throws Exception {
     }
     String[] globs = cmd.globs.toArray(new String[cmd.globs.size()]);
     if (cmd.globFile != null) {
-      globs = Stream.concat(
-          Arrays.stream(globs), Files.lines(cmd.globFile.toPath())
-        ).toArray(String[]::new);
+      globs = Stream.concat(Arrays.stream(globs),
+          Files.lines(cmd.globFile.toPath())
+              .map(String::trim)
+              .filter(s -> !s.isEmpty())
+      ).toArray(String[]::new);
     }
     try {
       processRepository(cmd.src, cmd.dst, cmd.cache, client, cmd.writeThreads, cmd.uploadThreads, globs);