fix: only run on staged files when using --staged (#8)

prettier · Jan 15, 2018 · 57f09b7 · 57f09b7
1 parent c1e7561
commit 57f09b7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/src/__tests__/scm-git.test.js b/src/__tests__/scm-git.test.js
@@ -25,7 +25,9 @@ const mockGitFs = () => {
       case 'ls-files':
         return { stdout: '' };
       case 'diff':
-        return { stdout: './foo.js\n' + './bar.md\n' };
+        return args[2] === '--cached'
+          ? { stdout: './foo.js\n' }
+          : { stdout: './foo.js\n' + './bar.md\n' };
       case 'add':
         return { stdout: '' };
       default:
@@ -149,15 +151,15 @@ describe('with git', () => {
     expect(fs.readFileSync('/bar.md', 'utf8')).toEqual('formatted:# foo');
   });
 
-  test('with --staged stages changed files', () => {
+  test('with --staged stages staged files', () => {
     mockGitFs();
 
     prettyQuick('root', { since: 'banana', staged: true });
 
     expect(execa.sync).toHaveBeenCalledWith('git', ['add', './foo.js'], {
       cwd: '/',
     });
-    expect(execa.sync).toHaveBeenCalledWith('git', ['add', './bar.md'], {
+    expect(execa.sync).not.toHaveBeenCalledWith('git', ['add', './bar.md'], {
       cwd: '/',
     });
   });

diff --git a/src/index.js b/src/index.js
@@ -25,7 +25,7 @@ export default (
   onFoundSinceRevision && onFoundSinceRevision(scm.name, revision);
 
   const changedFiles = scm
-    .getChangedFiles(directory, revision)
+    .getChangedFiles(directory, revision, staged)
     .filter(isSupportedExtension)
     .filter(createIgnorer(directory));
 

diff --git a/src/scms/git.js b/src/scms/git.js
@@ -25,20 +25,23 @@ export const getSinceRevision = (directory, { staged }) => {
   return runGit(directory, ['rev-parse', '--short', revision]).stdout.trim();
 };
 
-export const getChangedFiles = (directory, revision) => {
-  return [
-    ...getLines(
-      runGit(directory, [
-        'diff',
-        '--name-only',
-        '--diff-filter=ACMRTUB',
-        revision,
-      ])
-    ),
-    ...getLines(
-      runGit(directory, ['ls-files', '--others', '--exclude-standard'])
-    ),
-  ].filter(Boolean);
+export const getChangedFiles = (directory, revision, staged) => {
+  return (staged
+    ? getLines(runGit(directory, ['diff', '--name-only', '--cached', revision]))
+    : [
+        ...getLines(
+          runGit(directory, [
+            'diff',
+            '--name-only',
+            '--diff-filter=ACMRTUB',
+            revision,
+          ])
+        ),
+        ...getLines(
+          runGit(directory, ['ls-files', '--others', '--exclude-standard'])
+        ),
+      ]
+  ).filter(Boolean);
 };
 
 export const stageFile = (directory, file) => {