Merge pull request #1254 from atom/mkt-never-use-color

Disable all relevant color options when executing Git commands
atom · Nov 27, 2017 · abc8bc9 · abc8bc9
2 parents 0925039 + 773c43b
commit abc8bc9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js
@@ -41,6 +41,13 @@ export class LargeRepoError extends Error {
   }
 }
 
+const DISABLE_COLOR_FLAGS = [
+  'branch', 'diff', 'showBranch', 'status', 'ui',
+].reduce((acc, type) => {
+  acc.unshift('-c', `color.${type}=false`);
+  return acc;
+}, []);
+
 export default class GitShellOutStrategy {
   static defaultExecArgs = {
     stdin: null,
@@ -79,6 +86,8 @@ export default class GitShellOutStrategy {
 
   // Execute a command and read the output using the embedded Git environment
   async exec(args, options = GitShellOutStrategy.defaultExecArgs) {
+    args.unshift(...DISABLE_COLOR_FLAGS);
+
     /* eslint-disable no-console */
     const {stdin, useGitPromptServer, useGpgWrapper, useGpgAtomPrompt, writeOperation} = options;
     const subscriptions = new CompositeDisposable();

diff --git a/test/models/repository.test.js b/test/models/repository.test.js
@@ -830,7 +830,7 @@ describe('Repository', function() {
             await repo.abortMerge();
             assert.fail(null, null, 'repo.abortMerge() unexepctedly succeeded');
           } catch (e) {
-            assert.match(e.command, /^git merge --abort/);
+            assert.match(e.command, /^git .* merge --abort/);
           }
           assert.equal(await repo.isMerging(), true);
           assert.deepEqual(await repo.getStagedChanges(), stagedChanges);