Git - remove hard coded remote name when detecting the default branch (…

…#237423)
microsoft · Jan 7, 2025 · cbb7f99 · cbb7f99
1 parent e2e9a73
commit cbb7f99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -2779,8 +2779,8 @@ export class Repository {
 		return Promise.reject<Branch>(new Error(`No such branch: ${name}.`));
 	}
 
-	async getDefaultBranch(): Promise<Branch> {
-		const result = await this.exec(['symbolic-ref', '--short', 'refs/remotes/origin/HEAD']);
+	async getDefaultBranch(remoteName: string): Promise<Branch> {
+		const result = await this.exec(['symbolic-ref', '--short', `refs/remotes/${remoteName}/HEAD`]);
 		if (!result.stdout || result.stderr) {
 			throw new Error('No default branch');
 		}

diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
@@ -1593,7 +1593,12 @@ export class Repository implements Disposable {
 
 	private async getDefaultBranch(): Promise<Branch | undefined> {
 		try {
-			const defaultBranch = await this.repository.getDefaultBranch();
+			if (this.remotes.length === 0) {
+				return undefined;
+			}
+
+			const remote = this.remotes.find(r => r.name === 'origin') ?? this.remotes[0];
+			const defaultBranch = await this.repository.getDefaultBranch(remote.name);
 			return defaultBranch;
 		}
 		catch (err) {