Enable git.confirmSync by default (fixes #8655)

microsoft · Oct 6, 2016 · 3d9773d · 3d9773d
1 parent 7e4d966
commit 3d9773d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/vs/workbench/parts/git/browser/gitActions.ts b/src/vs/workbench/parts/git/browser/gitActions.ts
@@ -1121,7 +1121,7 @@ export class SyncAction extends GitAction {
 
  const config = this.configurationService.getConfiguration<IGitConfiguration>('git');
 
- if (config.confirmSync && !window.confirm(nls.localize('sureSync', "Are you sure you want to synchronize your git repository?"))) {
+ if (config.confirmSync && !window.confirm(nls.localize('sureSync', "Synchronize will first pull and then push. Are you sure you want to synchronize your git repository?"))) {
  return TPromise.as(null);
  }
 

diff --git a/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts b/src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts
@@ -557,7 +557,7 @@ export function registerContributions(): void {
  'git.confirmSync': {
  type: 'boolean',
  description: nls.localize('confirmSync', "Confirm before synchronizing git repositories."),
- default: false
+ default: true
  },
  'git.countBadge': {
  type: 'string',