Use Git.isPathIgnored even if root path does not match repo root

Fixes atom#120
nielsAD · Aug 25, 2015 · cb2f8d9 · cb2f8d9
1 parent f33760e
commit cb2f8d9
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/lib/load-paths-handler.coffee b/lib/load-paths-handler.coffee
@@ -11,10 +11,7 @@ class PathLoader
   constructor: (@rootPath, ignoreVcsIgnores, @traverseSymlinkDirectories, @ignoredNames) ->
     @paths = []
     @realPathCache = {}
-    @repo = null
-    if ignoreVcsIgnores
-      repo = GitRepository.open(@rootPath, refreshOnWindowFocus: false)
-      @repo = repo if repo?.relativize(path.join(@rootPath, 'test')) is 'test'
+    @repo = if ignoreVcsIgnores then GitRepository.open(@rootPath, refreshOnWindowFocus: false) else null
 
   load: (done) ->
     @loadPath @rootPath, =>
@@ -23,10 +20,10 @@ class PathLoader
       done()
 
   isIgnored: (loadedPath) ->
-    relativePath = path.relative(@rootPath, loadedPath)
-    if @repo?.isPathIgnored(relativePath)
+    if @repo?.isPathIgnored(loadedPath)
       true
     else
+      relativePath = path.relative(@rootPath, loadedPath)
       for ignoredName in @ignoredNames
         return true if ignoredName.match(relativePath)