Prioritize git environment variables from parent process (#3885)

yarnpkg · Jul 12, 2017 · 1de6ccc · 1de6ccc
1 parent df321cd
commit 1de6ccc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/__tests__/util/git.js b/__tests__/util/git.js
@@ -144,9 +144,9 @@ test('spawn', () => {
   Git.spawn(['status']);
 
   expect(spawnMock.calls[0][2].env).toMatchObject({
-    ...process.env,
     GIT_ASKPASS: '',
     GIT_TERMINAL_PROMPT: 0,
     GIT_SSH_COMMAND: 'ssh -oBatchMode=yes',
+    ...process.env,
   });
 });
diff --git a/src/util/git.js b/src/util/git.js
@@ -33,10 +33,10 @@ const supportsArchiveCache: {[key: string]: boolean} = map({
 
 // Suppress any password prompts since we run these in the background
 const env = {
-  ...process.env,
   GIT_ASKPASS: '',
   GIT_TERMINAL_PROMPT: 0,
   GIT_SSH_COMMAND: 'ssh -oBatchMode=yes',
+  ...process.env,
 };
 
 // This regex is designed to match output from git of the style: