Use VCS ignored even when in a subdirectory

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)
 

spec/fuzzy-finder-spec.coffee

@@ -923,15 +923,17 @@ describe 'FuzzyFinder', ->
             expect(bufferView.find('.status.status-added').closest('li').find('.file').text()).toBe 'newsample.js'
 
     describe "when core.excludeVcsIgnoredPaths is set to true", ->
+      [ignoreFile] = []
+
       beforeEach ->
         atom.config.set("core.excludeVcsIgnoredPaths", true)
+        ignoreFile = path.join(projectPath, '.gitignore')
 
       describe "when the project's path is the repository's working directory", ->
         beforeEach ->
-          ignoreFile = path.join(projectPath, '.gitignore')
-          fs.writeFileSync(ignoreFile, 'ignored.txt')
-
           ignoredFile = path.join(projectPath, 'ignored.txt')
+
+          fs.writeFileSync(ignoreFile, 'ignored.txt')
           fs.writeFileSync(ignoredFile, 'ignored text')
 
         it "excludes paths that are git ignored", ->
@@ -945,22 +947,25 @@ describe 'FuzzyFinder', ->
 
       describe "when the project's path is a subfolder of the repository's working directory", ->
         beforeEach ->
-          atom.project.setPaths([gitDirectory.resolve('dir')])
-          ignoreFile = path.join(projectPath, '.gitignore')
-          fs.writeFileSync(ignoreFile, 'b.txt')
+          dirPath = gitDirectory.resolve('dir')
+          atom.project.setPaths([dirPath])
+
+          ignoredFile = path.join(dirPath, 'ignored.txt')
 
-        it "does not exclude paths that are git ignored", ->
+          fs.writeFileSync(ignoreFile, 'ignored.txt')
+          fs.writeFileSync(ignoredFile, 'ignored text')
+
+        it "excludes paths that are git ignored", ->
           dispatchCommand('toggle-file-finder')
           projectView.setMaxItems(Infinity)
 
           waitForPathsToDisplay(projectView)
 
           runs ->
-            expect(projectView.list.find("li:contains(b.txt)")).toExist()
+            expect(projectView.list.find("li:contains(ignored.txt)")).not.toExist()
 
       describe "when the .gitignore matches parts of the path to the root folder", ->
         beforeEach ->
-          ignoreFile = path.join(projectPath, '.gitignore')
           fs.writeFileSync(ignoreFile, path.basename(projectPath))
 
         it "only applies the .gitignore patterns to relative paths within the root folder", ->