From 6793990e25bbfbcd35b146ea8b0a3e652bef0b29 Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Mon, 11 Dec 2017 17:51:40 +0100
Subject: [PATCH] move autoRepositoryDetection implementation

---
 extensions/git/package.nls.json  |  2 +-
 extensions/git/src/model.ts      |  7 +++++++
 extensions/git/src/repository.ts | 15 +--------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
index 990c6c8c3ab..542740ef483 100644
--- a/extensions/git/package.nls.json
+++ b/extensions/git/package.nls.json
@@ -49,7 +49,7 @@
 	"command.stashPopLatest": "Pop Latest Stash",
 	"config.enabled": "Whether git is enabled",
 	"config.path": "Path to the git executable",
-	"config.autoRepositoryDetection": "Whether a repository should be automatically detected for a single file",
+	"config.autoRepositoryDetection": "Whether repositories should be automatically detected",
 	"config.autorefresh": "Whether auto refreshing is enabled",
 	"config.autofetch": "Whether auto fetching is enabled",
 	"config.enableLongCommitWarning": "Whether long commit messages should be warned about",
diff --git a/extensions/git/src/model.ts b/extensions/git/src/model.ts
index a28d386c38b..e22242329e7 100644
--- a/extensions/git/src/model.ts
+++ b/extensions/git/src/model.ts
@@ -149,6 +149,13 @@ export class Model {
 	}
 
 	private onDidChangeVisibleTextEditors(editors: TextEditor[]): void {
+		const config = workspace.getConfiguration('git');
+		const enabled = config.get<boolean>('autoRepositoryDetection') === true;
+
+		if (!enabled) {
+			return;
+		}
+
 		editors.forEach(editor => {
 			const uri = editor.document.uri;
 
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 909b6ef570b..098ee2bd954 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -904,18 +904,9 @@ export class Repository implements Disposable {
 		const index: Resource[] = [];
 		const workingTree: Resource[] = [];
 		const merge: Resource[] = [];
-		const repoDetection = config.get<boolean>('autoRepositoryDetection') === true;
 
 		status.forEach(raw => {
-			const fullFilePath = path.join(this.repository.root, raw.path);
-
-			if (!repoDetection && workspace.workspaceFolders === undefined) {
-				if (!this.detectActiveFile(fullFilePath)) {
-					return;
-				}
-			}
-
-			const uri = Uri.file(fullFilePath);
+			const uri = Uri.file(path.join(this.repository.root, raw.path));
 			const renameUri = raw.rename ? Uri.file(path.join(this.repository.root, raw.rename)) : undefined;
 
 			switch (raw.x + raw.y) {
@@ -973,10 +964,6 @@ export class Repository implements Disposable {
 		this._onDidChangeStatus.fire();
 	}
 
-	private detectActiveFile(fullFilePath: string): boolean | undefined {
-		return window.activeTextEditor && window.activeTextEditor.document.fileName === fullFilePath;
-	}
-
 	private onFSChange(uri: Uri): void {
 		const config = workspace.getConfiguration('git');
 		const autorefresh = config.get<boolean>('autorefresh');