Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-03 23:39:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/52527/head' of github.com:Microsoft/vscode into pr/52527

Browse Source
This commit is contained in:
Joao Moreno
2018-09-12 12:01:51 +02:00
parent 7ffa9219ae 5c02579269
commit fa1deaaa34
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/git/src/statusbar.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import { Disposable, Command, EventEmitter, Event } from 'vscode';
import { Disposable, Command, EventEmitter, Event, workspace } from 'vscode';
import { Repository, Operation } from './repository';
import { anyEvent, dispose } from './util';
import * as nls from 'vscode-nls';
@@ -100,10 +100,18 @@ class SyncStatusBar {
if (HEAD && HEAD.name && HEAD.commit) {
if (HEAD.upstream) {
const config = workspace.getConfiguration('git');
const gitSyncRebase = config.get<string>('syncRebase');
if (HEAD.ahead || HEAD.behind) {
text += this.repository.syncLabel;
}
command = 'git.sync';
if (gitSyncRebase) {
command = 'git.syncRebase';
} else {
command = 'git.sync';
}
tooltip = localize('sync changes', "Synchronize Changes");
} else {
icon = '$(cloud-upload)';