Git - Fix error handling regression (microsoft#168421)

lszomoru · web-flow · commit 77290c654081 · 2022-12-08T11:15:44.000+01:00
Git - Fix error handling regression (microsoft#168284) Fix error handling regression
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -1658,7 +1658,7 @@ export class Repository implements Disposable {
 				}
 
 				if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
-					this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });
+					await this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });
 				}
 			});
 		});
@@ -1740,7 +1740,7 @@ export class Repository implements Disposable {
 					}
 
 					if (await this.checkIfMaybeRebased(this.HEAD?.name)) {
-						this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });
+						await this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });
 					}
 				};
 

Original file line number	Diff line number	Diff line change
`@@ -1658,7 +1658,7 @@ export class Repository implements Disposable {`
`1658`	`1658`	`}`
`1659`	`1659`
`1660`	`1660`	`if (await this.checkIfMaybeRebased(this.HEAD?.name)) {`
`1661`		`- this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });`
	`1661`	`+ await this._pullAndHandleTagConflict(rebase, remote, branch, { unshallow, tags });`
`1662`	`1662`	`}`
`1663`	`1663`	`});`
`1664`	`1664`	`});`
`@@ -1740,7 +1740,7 @@ export class Repository implements Disposable {`
`1740`	`1740`	`}`
`1741`	`1741`
`1742`	`1742`	`if (await this.checkIfMaybeRebased(this.HEAD?.name)) {`
`1743`		`- this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });`
	`1743`	`+ await this._pullAndHandleTagConflict(rebase, remoteName, pullBranch, { tags, cancellationToken });`
`1744`	`1744`	`}`
`1745`	`1745`	`};`
`1746`	`1746`