diff --git a/extensions/git/package.json b/extensions/git/package.json index 36b0685c2b3..bf64cbad47d 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -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", diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 5029cbd5cb4..68bef77a393 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -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.", diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index 81e1e077a6e..5442f3db15e 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -1255,7 +1255,7 @@ export class Repository implements Disposable { const config = workspace.getConfiguration('git', Uri.file(this.root)); const fetchOnPull = config.get('fetchOnPull'); const tags = config.get('pullTags'); - const pushTags = config.get('pushTags'); + const followTags = config.get('followTagsWhenSync'); const supportCancellation = config.get('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); } }); });