From 2c0167ef9906e7ee765f99e3b1244de2e56bd4e8 Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Fri, 14 Sep 2018 10:14:24 +0200
Subject: [PATCH] git: getBranch should resolve @ name syntax

---
 extensions/git/src/git.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index 5fd084d4a0e..1de38653db4 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -1429,6 +1429,10 @@ export class Repository {
 	async getBranch(name: string): Promise<Branch> {
 		if (name === 'HEAD') {
 			return this.getHEAD();
+		} else if (/^@/.test(name)) {
+			const symbolicFullNameResult = await this.run(['rev-parse', '--symbolic-full-name', name]);
+			const symbolicFullName = symbolicFullNameResult.stdout.trim();
+			name = symbolicFullName || name;
 		}
 
 		const result = await this.run(['rev-parse', name]);