use --follow-tags instead of --tags when pushing

joaomoreno · joaomoreno · commit 4a3c056e9a56 · 2019-06-12T11:06:54.000+02:00
fixes microsoft#70081 fixes microsoft#75240
diff --git a/extensions/git/package.json b/extensions/git/package.json
@@ -319,12 +319,12 @@
       },
       {
         "command": "git.pushWithTags",
-        "title": "%command.pushWithTags%",
+        "title": "%command.pushFollowTags%",
         "category": "Git"
       },
       {
         "command": "git.pushWithTagsForce",
-        "title": "%command.pushWithTagsForce%",
+        "title": "%command.pushFollowTagsForce%",
         "category": "Git"
       },
       {
diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
@@ -47,8 +47,8 @@
 	"command.pushForce": "Push (Force)",
 	"command.pushTo": "Push to...",
 	"command.pushToForce": "Push to... (Force)",
-	"command.pushWithTags": "Push With Tags",
-	"command.pushWithTagsForce": "Push With Tags (Force)",
+	"command.pushWithTags": "Push (Follow Tags)",
+	"command.pushWithTagsForce": "Push (Follow Tags, Force)",
 	"command.addRemote": "Add Remote",
 	"command.removeRemote": "Remove Remote",
 	"command.sync": "Sync",
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -202,7 +202,7 @@ function createCheckoutItems(repository: Repository): CheckoutItem[] {
 enum PushType {
 	Push,
 	PushTo,
-	PushTags,
+	PushFollowTags,
 }
 
 interface PushOptions {
@@ -1759,10 +1759,8 @@ export class CommandCenter {
 			}
 		}
 
-		if (pushOptions.pushType === PushType.PushTags) {
-			await repository.pushTags(undefined, forcePushMode);
-
-			window.showInformationMessage(localize('push with tags success', "Successfully pushed with tags."));
+		if (pushOptions.pushType === PushType.PushFollowTags) {
+			await repository.pushFollowTags(undefined, forcePushMode);
 			return;
 		}
 
@@ -1819,13 +1817,13 @@ export class CommandCenter {
 	}
 
 	@command('git.pushWithTags', { repository: true })
-	async pushWithTags(repository: Repository): Promise<void> {
-		await this._push(repository, { pushType: PushType.PushTags });
+	async pushFollowTags(repository: Repository): Promise<void> {
+		await this._push(repository, { pushType: PushType.PushFollowTags });
 	}
 
 	@command('git.pushWithTagsForce', { repository: true })
-	async pushWithTagsForce(repository: Repository): Promise<void> {
-		await this._push(repository, { pushType: PushType.PushTags, forcePush: true });
+	async pushFollowTagsForce(repository: Repository): Promise<void> {
+		await this._push(repository, { pushType: PushType.PushFollowTags, forcePush: true });
 	}
 
 	@command('git.pushTo', { repository: true })
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -1425,7 +1425,7 @@ export class Repository {
 		}
 
 		if (tags) {
-			args.push('--tags');
+			args.push('--follow-tags');
 		}
 
 		if (remote) {
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -1013,7 +1013,7 @@ export class Repository implements Disposable {
 		await this.run(Operation.Push, () => this.repository.push(remote, name, setUpstream, undefined, forcePushMode));
 	}
 
-	async pushTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {
+	async pushFollowTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {
 		await this.run(Operation.Push, () => this.repository.push(remote, undefined, false, true, forcePushMode));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -319,12 +319,12 @@`
`319`	`319`	`},`
`320`	`320`	`{`
`321`	`321`	`"command": "git.pushWithTags",`
`322`		`- "title": "%command.pushWithTags%",`
	`322`	`+ "title": "%command.pushFollowTags%",`
`323`	`323`	`"category": "Git"`
`324`	`324`	`},`
`325`	`325`	`{`
`326`	`326`	`"command": "git.pushWithTagsForce",`
`327`		`- "title": "%command.pushWithTagsForce%",`
	`327`	`+ "title": "%command.pushFollowTagsForce%",`
`328`	`328`	`"category": "Git"`
`329`	`329`	`},`
`330`	`330`	`{`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ function createCheckoutItems(repository: Repository): CheckoutItem[] {`
`202`	`202`	`enum PushType {`
`203`	`203`	`Push,`
`204`	`204`	`PushTo,`
`205`		`- PushTags,`
	`205`	`+ PushFollowTags,`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`interface PushOptions {`
`@@ -1759,10 +1759,8 @@ export class CommandCenter {`
`1759`	`1759`	`}`
`1760`	`1760`	`}`
`1761`	`1761`
`1762`		`- if (pushOptions.pushType === PushType.PushTags) {`
`1763`		`- await repository.pushTags(undefined, forcePushMode);`
`1764`		`-`
`1765`		`- window.showInformationMessage(localize('push with tags success', "Successfully pushed with tags."));`
	`1762`	`+ if (pushOptions.pushType === PushType.PushFollowTags) {`
	`1763`	`+ await repository.pushFollowTags(undefined, forcePushMode);`
`1766`	`1764`	`return;`
`1767`	`1765`	`}`
`1768`	`1766`
`@@ -1819,13 +1817,13 @@ export class CommandCenter {`
`1819`	`1817`	`}`
`1820`	`1818`
`1821`	`1819`	`@command('git.pushWithTags', { repository: true })`
`1822`		`- async pushWithTags(repository: Repository): Promise<void> {`
`1823`		`- await this._push(repository, { pushType: PushType.PushTags });`
	`1820`	`+ async pushFollowTags(repository: Repository): Promise<void> {`
	`1821`	`+ await this._push(repository, { pushType: PushType.PushFollowTags });`
`1824`	`1822`	`}`
`1825`	`1823`
`1826`	`1824`	`@command('git.pushWithTagsForce', { repository: true })`
`1827`		`- async pushWithTagsForce(repository: Repository): Promise<void> {`
`1828`		`- await this._push(repository, { pushType: PushType.PushTags, forcePush: true });`
	`1825`	`+ async pushFollowTagsForce(repository: Repository): Promise<void> {`
	`1826`	`+ await this._push(repository, { pushType: PushType.PushFollowTags, forcePush: true });`
`1829`	`1827`	`}`
`1830`	`1828`
`1831`	`1829`	`@command('git.pushTo', { repository: true })`
Original file line number	Diff line number	Diff line change
`@@ -1425,7 +1425,7 @@ export class Repository {`
`1425`	`1425`	`}`
`1426`	`1426`
`1427`	`1427`	`if (tags) {`
`1428`		`- args.push('--tags');`
	`1428`	`+ args.push('--follow-tags');`
`1429`	`1429`	`}`
`1430`	`1430`
`1431`	`1431`	`if (remote) {`
Original file line number	Diff line number	Diff line change
`@@ -1013,7 +1013,7 @@ export class Repository implements Disposable {`
`1013`	`1013`	`await this.run(Operation.Push, () => this.repository.push(remote, name, setUpstream, undefined, forcePushMode));`
`1014`	`1014`	`}`
`1015`	`1015`
`1016`		`- async pushTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {`
	`1016`	`+ async pushFollowTags(remote?: string, forcePushMode?: ForcePushMode): Promise<void> {`
`1017`	`1017`	`await this.run(Operation.Push, () => this.repository.push(remote, undefined, false, true, forcePushMode));`
`1018`	`1018`	`}`
`1019`	`1019`