From 057500153b40841b548193c46de27d7baf39ae28 Mon Sep 17 00:00:00 2001
From: Anthony Van de Gejuchte <anthonyvdgent@gmail.com>
Date: Mon, 20 Apr 2020 14:13:34 +0200
Subject: [PATCH] Move env declaration of GIT_PAGER

---
 extensions/git/src/git.ts  | 3 ++-
 extensions/git/src/main.ts | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index f3de788998f..62f20c51ec9 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -540,7 +540,8 @@ export class Git {
 		options.env = assign({}, process.env, this.env, options.env || {}, {
 			VSCODE_GIT_COMMAND: args[0],
 			LC_ALL: 'en_US.UTF-8',
-			LANG: 'en_US.UTF-8'
+			LANG: 'en_US.UTF-8',
+			GIT_PAGER: ''
 		});
 
 		if (options.cwd) {
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index fa86a587467..571c29f6f36 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -36,9 +36,7 @@ async function createModel(context: ExtensionContext, outputChannel: OutputChann
 	const pathHint = workspace.getConfiguration('git').get<string>('path');
 	const info = await findGit(pathHint, path => outputChannel.appendLine(localize('looking', "Looking for git in: {0}", path)));
 
-	let env: any = {
-		GIT_PAGER: ''
-	};
+	let env: any = {};
 	let ipc: IIPCServer | undefined;
 
 	try {
-- 
GitLab