Skip to content

Commit c6b48c3

Browse files
authored
Git - remove references of scm.experimental.showSyncView from the Commit action button (microsoft#199616)
1 parent 36fefc8 commit c6b48c3

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

extensions/git/src/actionButton.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ export class CommitActionButton extends AbstractActionButton {
182182
this.onDidChangeSmartCommitSettings();
183183
}
184184

185-
if (e.affectsConfiguration('scm.experimental.showSyncView') ||
186-
e.affectsConfiguration('git.branchProtectionPrompt', root) ||
185+
if (e.affectsConfiguration('git.branchProtectionPrompt', root) ||
187186
e.affectsConfiguration('git.postCommitCommand', root) ||
188187
e.affectsConfiguration('git.rememberPostCommitCommand', root) ||
189188
e.affectsConfiguration('git.showActionButton', root)) {
@@ -256,11 +255,6 @@ export class CommitActionButton extends AbstractActionButton {
256255
}
257256

258257
protected override getPublishBranchActionButton(): SourceControlActionButton | undefined {
259-
const scmConfig = workspace.getConfiguration('scm');
260-
if (scmConfig.get<boolean>('experimental.showSyncView', false)) {
261-
return undefined;
262-
}
263-
264258
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
265259
const showActionButton = config.get<{ publish: boolean }>('showActionButton', { publish: true });
266260

@@ -271,11 +265,6 @@ export class CommitActionButton extends AbstractActionButton {
271265
}
272266

273267
protected override getSyncChangesActionButton(): SourceControlActionButton | undefined {
274-
const scmConfig = workspace.getConfiguration('scm');
275-
if (scmConfig.get<boolean>('experimental.showSyncView', false)) {
276-
return undefined;
277-
}
278-
279268
const config = workspace.getConfiguration('git', Uri.file(this.repository.root));
280269
const showActionButton = config.get<{ sync: boolean }>('showActionButton', { sync: true });
281270
const branchIsAheadOrBehind = (this.state.HEAD?.behind ?? 0) > 0 || (this.state.HEAD?.ahead ?? 0) > 0;

0 commit comments

Comments
 (0)