fix(git): use branch --show-current to get current branch (#1597)

LeoBorai · web-flow · commit 7c36e564e3ce · 2024-03-02T10:50:08.000-06:00
diff --git a/CodeEdit/Features/Git/Client/GitClient+Branches.swift b/CodeEdit/Features/Git/Client/GitClient+Branches.swift
@@ -31,7 +31,7 @@ extension GitClient {
 
     /// Get current branch
     func getCurrentBranch() async throws -> GitBranch? {
-        let branchName = try await run("rev-parse --abbrev-ref HEAD").trimmingCharacters(in: .whitespacesAndNewlines)
+        let branchName = try await run("branch --show-current").trimmingCharacters(in: .whitespacesAndNewlines)
         let components = try await run(
             "for-each-ref --format=\"%(refname)|%(upstream:short)\" refs/heads/\(branchName)"
         )

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ extension GitClient {`
`31`	`31`
`32`	`32`	`/// Get current branch`
`33`	`33`	`func getCurrentBranch() async throws -> GitBranch? {`
`34`		`- let branchName = try await run("rev-parse --abbrev-ref HEAD").trimmingCharacters(in: .whitespacesAndNewlines)`
	`34`	`+ let branchName = try await run("branch --show-current").trimmingCharacters(in: .whitespacesAndNewlines)`
`35`	`35`	`let components = try await run(`
`36`	`36`	`"for-each-ref --format=\"%(refname)\|%(upstream:short)\" refs/heads/\(branchName)"`
`37`	`37`	`)`