Skip to content

Commit da1a35a

Browse files
committed
Merge commit 'refs/pull/47890/head' of github.com:Microsoft/vscode into pr/47890
2 parents b5e8f88 + 59c0646 commit da1a35a

3 files changed

Lines changed: 13 additions & 1 deletion

File tree

‎extensions/git/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,12 @@
10011001
"scope": "resource",
10021002
"default": false,
10031003
"description": "%config.alwaysSignOff%"
1004+
},
1005+
"git.ignoreRepositories": {
1006+
"type": "array",
1007+
"default": [],
1008+
"scope": "window",
1009+
"description": "%config.ignoredRepositories%"
10041010
}
10051011
}
10061012
},

‎extensions/git/package.nls.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@
7474
"colors.added": "Color for added resources.",
7575
"config.detectSubmodulesLimit": "Controls the limit of git submodules detected.",
7676
"config.alwaysSignOff": "Controls the signoff flag for all commits",
77+
"config.ignoredRepositories": "List of git repositories to ignore",
7778
"colors.modified": "Color for modified resources.",
7879
"colors.deleted": "Color for deleted resources.",
7980
"colors.untracked": "Color for untracked resources.",
8081
"colors.ignored": "Color for ignored resources.",
8182
"colors.conflict": "Color for resources with conflicts.",
8283
"colors.submodule": "Color for submodule resources."
83-
}
84+
}

‎extensions/git/src/model.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ export class Model {
190190

191191
const config = workspace.getConfiguration('git', Uri.file(path));
192192
const enabled = config.get<boolean>('enabled') === true;
193+
const ignoredRepos = new Set(config.get<Array<string>>('ignoreRepositories'));
193194

194195
if (!enabled) {
195196
return;
@@ -207,6 +208,10 @@ export class Model {
207208
return;
208209
}
209210

211+
if (ignoredRepos.has(rawRoot)) {
212+
return;
213+
}
214+
210215
const repository = new Repository(this.git.open(repositoryRoot), this.globalState);
211216

212217
this.open(repository);

0 commit comments

Comments
 (0)