Branch does not exist locally popup (and it doesn't go away) (#7855)

alexr00 · web-flow · commit dc08c79bc3b7 · 2025-09-25T12:58:06.000+02:00
Fixes #7687
diff --git a/src/github/createPRViewProvider.ts b/src/github/createPRViewProvider.ts
@@ -1303,10 +1303,12 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv
 		} else {
 			try {
 				compareBranch = await this._folderRepositoryManager.repository.getBranch(newBranch);
-				await this.model.setCompareBranch(newBranch);
 			} catch (e) {
 				vscode.window.showErrorMessage(vscode.l10n.t('Branch does not exist locally.'));
 			}
+			if (compareBranch) {
+				await this.model.setCompareBranch(newBranch);
+			}
 		}
 
 		compareBranch = compareBranch ?? await this._folderRepositoryManager.repository.getBranch(this.model.compareBranch);

Original file line number	Diff line number	Diff line change
`@@ -1303,10 +1303,12 @@ export class CreatePullRequestViewProvider extends BaseCreatePullRequestViewProv`
`1303`	`1303`	`} else {`
`1304`	`1304`	`try {`
`1305`	`1305`	`compareBranch = await this._folderRepositoryManager.repository.getBranch(newBranch);`
`1306`		`- await this.model.setCompareBranch(newBranch);`
`1307`	`1306`	`} catch (e) {`
`1308`	`1307`	`vscode.window.showErrorMessage(vscode.l10n.t('Branch does not exist locally.'));`
`1309`	`1308`	`}`
	`1309`	`+ if (compareBranch) {`
	`1310`	`+ await this.model.setCompareBranch(newBranch);`
	`1311`	`+ }`
`1310`	`1312`	`}`
`1311`	`1313`
`1312`	`1314`	`compareBranch = compareBranch ?? await this._folderRepositoryManager.repository.getBranch(this.model.compareBranch);`