fix: Ignore path conflicts and use spawn instead of exec

Author: rtfpessoa

src/__tests__/cli-tests.ts

@@ -30,7 +30,7 @@ describe('cli', () => {
       await cli.getInput('command', ['lol', 'foo'], []);
 
       expect(executeSpy).toHaveBeenCalledTimes(1);
-      expect(executeSpy).toHaveBeenCalledWith('git diff "lol" "foo" --no-color ');
+      expect(executeSpy).toHaveBeenCalledWith('git', ['diff', '--no-color', 'lol', 'foo']);
     });
   });
 

src/cli.ts

@@ -11,14 +11,31 @@ import * as log from './logger';
 import { Configuration, InputType, DiffyType } from './types';
 import * as utils from './utils';
 
-function runGitDiff(gitArgsArr: string[], ignore: string[]): string {
-  const baseArgs = gitArgsArr.length > 0 ? gitArgsArr.map(arg => `"${arg}"`) : ['-M', '-C', 'HEAD'];
-  const colorArgs = gitArgsArr.indexOf('--no-color') < 0 ? ['--no-color'] : [];
-  const ignoreArgs = ignore.map(file => `":(exclude)${file}"`);
+const defaultArgs = ['-M', '-C', 'HEAD'];
+
+function generateGitDiffArgs(gitArgsArr: string[], ignore: string[]): string[] {
+  const gitDiffArgs: string[] = ['diff'];
+
+  if (!gitArgsArr.includes('--no-color')) gitDiffArgs.push('--no-color');
 
-  const diffCommand = `git diff ${baseArgs.join(' ')} ${colorArgs.join(' ')} ${ignoreArgs.join(' ')}`;
+  if (gitArgsArr.length === 0) Array.prototype.push.apply(gitDiffArgs, defaultArgs);
 
-  return utils.execute(diffCommand);
+  Array.prototype.push.apply(gitDiffArgs, gitArgsArr);
+
+  if (ignore.length > 0) {
+    if (!gitArgsArr.includes('--')) gitDiffArgs.push('--');
+    Array.prototype.push.apply(
+      gitDiffArgs,
+      ignore.map(path => `:(exclude)${path}`),
+    );
+  }
+
+  return gitDiffArgs;
+}
+
+function runGitDiff(gitArgsArr: string[], ignore: string[]): string {
+  const gitDiffArgs = generateGitDiffArgs(gitArgsArr, ignore);
+  return utils.execute('git', gitDiffArgs);
 }
 
 function prepareHTML(diffHTMLContent: string, config: Configuration): string {

src/utils.ts

@@ -28,8 +28,8 @@ export function writeFile(filePath: string, content: string): void {
   return fs.writeFileSync(filePath, content);
 }
 
-export function execute(cmd: string): string {
-  return childProcess.execSync(cmd).toString('utf8');
+export function execute(executable: string, args: string[]): string {
+  return childProcess.spawnSync(executable, args, { encoding: 'utf8' }).stdout;
 }
 
 export function replaceExactly(value: string, searchValue: string, replaceValue: string): string {