Skip to content

Commit 1d0271f

Browse files
committed
Merge branch 'submodule-limit-workspace-setting' of https://github.com/shobhitchittora/vscode into shobhitchittora-submodule-limit-workspace-setting
2 parents 0797fa3 + 1c6aa0e commit 1d0271f

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

‎extensions/git/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,6 +981,12 @@
981981
"scope": "resource",
982982
"default": true,
983983
"description": "%config.detectSubmodules%"
984+
},
985+
"git.detectSubmodulesLimit": {
986+
"type": "number",
987+
"scope": "resource",
988+
"default": 10,
989+
"description": "%config.detectSubmodulesLimit%"
984990
}
985991
}
986992
},

‎extensions/git/package.nls.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"config.showInlineOpenFileAction": "Controls whether to show an inline Open File action in the Git changes view.",
7171
"config.inputValidation": "Controls when to show commit message input validation.",
7272
"config.detectSubmodules": "Controls whether to automatically detect git submodules.",
73+
"config.detectSubmodulesLimit": "Controls the number of git submodules detected.",
7374
"colors.modified": "Color for modified resources.",
7475
"colors.deleted": "Color for deleted resources.",
7576
"colors.untracked": "Color for untracked resources.",

‎extensions/git/src/model.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,12 @@ export class Model {
227227
const changeListener = repository.onDidChangeRepository(uri => this._onDidChangeRepository.fire({ repository, uri }));
228228
const originalResourceChangeListener = repository.onDidChangeOriginalResource(uri => this._onDidChangeOriginalResource.fire({ repository, uri }));
229229

230+
const submodulesLimit = <number>workspace
231+
.getConfiguration('git', Uri.file(repository.root))
232+
.get<number>('detectSubmodulesLimit');
233+
230234
const checkForSubmodules = () => {
231-
if (repository.submodules.length > 10) {
235+
if (repository.submodules.length > submodulesLimit) {
232236
window.showWarningMessage(localize('too many submodules', "The '{0}' repository has {1} submodules which won't be opened automatically. You can still open each one individually by opening a file within.", path.basename(repository.root), repository.submodules.length));
233237
statusListener.dispose();
234238
return;

0 commit comments

Comments
 (0)