From a8b09d47116d058ca041cb39a887cffb6d09ce4b Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Fri, 25 Oct 2019 15:14:59 +0200
Subject: [PATCH] fixed scope

---
 extensions/git/package.json      |  6 ++++--
 extensions/git/src/commands.ts   |  8 ++------
 extensions/git/src/repository.ts | 14 ++++++--------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/extensions/git/package.json b/extensions/git/package.json
index 99ef7bd9f5c..18e56b3b10c 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1252,7 +1252,8 @@
             "%config.countBadge.off%"
           ],
           "description": "%config.countBadge%",
-          "default": "all"
+          "default": "all",
+          "scope": "resource"
         },
         "git.checkoutType": {
           "type": "string",
@@ -1526,7 +1527,8 @@
             "%config.handleUntracked.hide%"
           ],
           "default": "withchanges",
-          "description": "%config.handleUntracked%"
+          "description": "%config.handleUntracked%",
+          "scope": "resource"
         }
       }
     },
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 4975aa5d372..d569db042ee 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -914,12 +914,8 @@ export class CommandCenter {
 			}
 		}
 
-		const handleUntracked =
-			workspace
-				.getConfiguration('git', Uri.file(repository.root))
-				.get<'withchanges' | 'separate' | 'hide'>('handleUntracked') ||
-			'withchanges';
-		let includeUntracked;
+		const handleUntracked = workspace.getConfiguration('git', Uri.file(repository.root)).get<'withchanges' | 'separate' | 'hide'>('handleUntracked');
+		let includeUntracked = false;
 		switch (handleUntracked) {
 			case 'withchanges':
 				includeUntracked = true;
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index 5e181ad309c..06af5637bae 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -1447,6 +1447,7 @@ export class Repository implements Disposable {
 	private async updateModelState(): Promise<void> {
 		const { status, didHitLimit } = await this.repository.getStatus();
 		const config = workspace.getConfiguration('git');
+		const scopedConfig = workspace.getConfiguration('git', Uri.file(this.repository.root));
 		const shouldIgnore = config.get<boolean>('ignoreLimitWarning') === true;
 		const useIcons = !config.get<boolean>('decorations.enabled', true);
 		this.isRepositoryHuge = didHitLimit;
@@ -1507,9 +1508,7 @@ export class Repository implements Disposable {
 		this._submodules = submodules!;
 		this.rebaseCommit = rebaseCommit;
 
-		const handleUntracked =
-			config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked') ||
-			'withchanges';
+		const handleUntracked = scopedConfig.get<'withchanges' | 'separate' | 'hide'>('handleUntracked');
 		const index: Resource[] = [];
 		const workingTree: Resource[] = [];
 		const merge: Resource[] = [];
@@ -1586,11 +1585,10 @@ export class Repository implements Disposable {
 	}
 
 	private setCountBadge(): void {
-		const config = workspace.getConfiguration('git');
-		const countBadge = config.get<string>('countBadge');
-		const handleUntracked =
-			config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked') ||
-			'withchanges';
+		const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
+		const countBadge = config.get<'all' | 'tracked' | 'off'>('countBadge');
+		const handleUntracked = config.get<'withchanges' | 'separate' | 'hide'>('handleUntracked');
+
 		let count =
 			this.mergeGroup.resourceStates.length +
 			this.indexGroup.resourceStates.length +