From b722b506f8253f1ceaf7f2364ca8d02441bdde47 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu <sasomava@microsoft.com>
Date: Thu, 1 Feb 2018 21:22:44 +0100
Subject: [PATCH] Fix #42709

---
 extensions/git/src/main.ts | 6 +++---
 src/vs/vscode.d.ts         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index 3de488c35dd..3fdb055e264 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -93,7 +93,7 @@ async function _activate(context: ExtensionContext, disposables: Disposable[]):
 }
 
 export function activate(context: ExtensionContext): API {
-	const config = workspace.getConfiguration('git', null as any as undefined);
+	const config = workspace.getConfiguration('git', null);
 	const enabled = config.get<boolean>('enabled');
 
 	const disposables: Disposable[] = [];
@@ -104,8 +104,8 @@ export function activate(context: ExtensionContext): API {
 	if (enabled) {
 		activatePromise = _activate(context, disposables);
 	} else {
-		const onConfigChange = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git', null as any as undefined));
-		const onEnabled = filterEvent(onConfigChange, () => workspace.getConfiguration('git', null as any as undefined).get<boolean>('enabled') === true);
+		const onConfigChange = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git'));
+		const onEnabled = filterEvent(onConfigChange, () => workspace.getConfiguration('git', null).get<boolean>('enabled') === true);
 
 		activatePromise = eventToPromise(onEnabled)
 			.then(() => _activate(context, disposables));
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 9b027a59cf9..cfcb69a2975 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -5602,7 +5602,7 @@ declare module 'vscode' {
 		 * @param resource A resource for which the configuration is asked for
 		 * @return The full configuration or a subset.
 		 */
-		export function getConfiguration(section?: string, resource?: Uri): WorkspaceConfiguration;
+		export function getConfiguration(section?: string, resource?: Uri | null): WorkspaceConfiguration;
 
 		/**
 		 * An event that is emitted when the [configuration](#WorkspaceConfiguration) changed.