maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

💄

Browse source
This commit is contained in:
João Moreno 2020-11-09 16:08:03 +01:00
parent 978d39324a
commit 309cabdf51
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/git/package.json
View file

@ -1797,11 +1797,11 @@
"description": "%config.enableStatusBarSync%",
"scope": "resource"
},
"git.pushTags": {
"git.followTagsWhenSync": {
"type": "boolean",
"scope": "resource",
"default": false,
"description": "%config.pushTags%"
"description": "%config.followTagsWhenSync%"
},
"git.promptToSaveFilesBeforeStash": {
"type": "string",

2
extensions/git/package.nls.json
View file

@ -123,7 +123,7 @@
"config.discardAllScope": "Controls what changes are discarded by the `Discard all changes` command. `all` discards all changes. `tracked` discards only tracked files. `prompt` shows a prompt dialog every time the action is run.",
"config.decorations.enabled": "Controls whether Git contributes colors and badges to the explorer and the open editors view.",
"config.enableStatusBarSync": "Controls whether the Git Sync command appears in the status bar.",
"config.pushTags": "Push all tags when synchronizing.",
"config.followTagsWhenSync": "Follow push all tags when running the sync command.",
"config.promptToSaveFilesBeforeStash": "Controls whether Git should check for unsaved files before stashing changes.",
"config.promptToSaveFilesBeforeStash.always": "Check for any unsaved files.",
"config.promptToSaveFilesBeforeStash.staged": "Check only for unsaved staged files.",

4
extensions/git/src/repository.ts
View file

@ -1255,7 +1255,7 @@ export class Repository implements Disposable {
const config = workspace.getConfiguration('git', Uri.file(this.root));
const fetchOnPull = config.get<boolean>('fetchOnPull');
const tags = config.get<boolean>('pullTags');
const pushTags = config.get<boolean>('pushTags');
const followTags = config.get<boolean>('followTagsWhenSync');
const supportCancellation = config.get<boolean>('supportCancellation');
const fn = fetchOnPull
@ -1283,7 +1283,7 @@ export class Repository implements Disposable {
const shouldPush = this.HEAD && (typeof this.HEAD.ahead === 'number' ? this.HEAD.ahead > 0 : true);
if (shouldPush) {
await this._push(remoteName, pushBranch, false, pushTags);
await this._push(remoteName, pushBranch, false, followTags);
}
});
});