Merge pull request #4667 from w33ble/fix/staged-linting

Fix linting of staged files
elastic · Aug 13, 2015 · 3a8b664 · 3a8b664
2 parents bbfba96 + 2d43d1c
commit 3a8b664
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/tasks/lintStagedFiles.js b/tasks/lintStagedFiles.js
@@ -14,15 +14,20 @@ module.exports = function (grunt) {
       diff(['--name-only', '--cached'])
       .then(function (files) {
         // match these patterns
-        var patterns = grunt.config.get('eslint.files.src');
-        files = files.split('\n').filter(Boolean).map(function (file) {
+        var patterns = grunt.config.get('eslint.source.files.src');
+        if (!patterns) grunt.fail.warn('eslint file pattern is not defined');
+
+        files = files.split('\n').filter(Boolean)
+        .map(function (file) {
           return resolve(root, file);
+        })
+        .filter(function (file) {
+          return grunt.file.isMatch(patterns, file);
         });
 
-        files = grunt.file.match(patterns, files);
-        grunt.log.debug(files);
-
+        grunt.log.ok('Staged files to lint: ' + files.length);
         if (!_.size(files)) return;
+
         grunt.config.set('eslint.staged.files.src', files);
         grunt.task.run(['eslint:staged']);
       })