Merge commit 'refs/pull/81982/head' of github.com:microsoft/vscode into pr/81982

joaomoreno · joaomoreno · commit 968de6153298 · 2020-04-20T14:25:59.000+02:00
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -1663,6 +1663,12 @@
           "default": "mixed",
           "description": "%config.untrackedChanges%",
           "scope": "resource"
+        },
+        "git.showCommitInput": {
+          "type": "boolean",
+          "scope": "resource",
+          "default": true,
+          "description": "%config.showCommitInput%"
         }
       }
     },
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -143,6 +143,7 @@
 	"config.untrackedChanges.mixed": "All changes, tracked and untracked, appear together and behave equally.",
 	"config.untrackedChanges.separate": "Untracked changes appear separately in the Source Control view. They are also excluded from several actions.",
 	"config.untrackedChanges.hidden": "Untracked changes are hidden and excluded from several actions.",
+	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 	"colors.added": "Color for added resources.",
 	"colors.modified": "Color for modified resources.",
 	"colors.deleted": "Color for deleted resources.",
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -743,6 +743,15 @@ export class Repository implements Disposable {
 		const onConfigListenerForUntracked = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.untrackedChanges', root));
 		onConfigListenerForUntracked(this.updateModelState, this, this.disposables);
 
+		const updateInputBoxVisibility = () => {
+			const config = workspace.getConfiguration('git', root);
+			this._sourceControl.inputBox.visible = config.get<boolean>('showCommitInput', true);
+		};
+
+		const onConfigListenerForInputBoxVisibility = filterEvent(workspace.onDidChangeConfiguration, e => e.affectsConfiguration('git.showCommitInput', root));
+		onConfigListenerForInputBoxVisibility(updateInputBoxVisibility, this, this.disposables);
+		updateInputBoxVisibility();
+
 		this.mergeGroup.hideWhenEmpty = true;
 		this.untrackedGroup.hideWhenEmpty = true;
 

Original file line number	Diff line number	Diff line change
`@@ -1663,6 +1663,12 @@`
`1663`	`1663`	`"default": "mixed",`
`1664`	`1664`	`"description": "%config.untrackedChanges%",`
`1665`	`1665`	`"scope": "resource"`
	`1666`	`+ },`
	`1667`	`+ "git.showCommitInput": {`
	`1668`	`+ "type": "boolean",`
	`1669`	`+ "scope": "resource",`
	`1670`	`+ "default": true,`
	`1671`	`+ "description": "%config.showCommitInput%"`
`1666`	`1672`	`}`
`1667`	`1673`	`}`
`1668`	`1674`	`},`