fix: sometimes track status is not correct because the local branch name is ambiguous to git

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Commands/QueryBranches.cs

@@ -27,15 +27,15 @@ public QueryBranches(string repo)
                 return branches;
 
             var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
-            var remoteBranches = new HashSet<string>();
+            var remoteHeads = new Dictionary<string, string>();
             foreach (var line in lines)
             {
                 var b = ParseLine(line);
                 if (b != null)
                 {
                     branches.Add(b);
                     if (!b.IsLocal)
-                        remoteBranches.Add(b.FullName);
+                        remoteHeads.Add(b.FullName, b.Head);
                     else
                         localBranchesCount++;
                 }
@@ -44,7 +44,22 @@ public QueryBranches(string repo)
             foreach (var b in branches)
             {
                 if (b.IsLocal && !string.IsNullOrEmpty(b.Upstream))
-                    b.IsUpstreamGone = !remoteBranches.Contains(b.Upstream);
+                {
+                    if (remoteHeads.TryGetValue(b.Upstream, out var upstreamHead))
+                    {
+                        b.IsUpstreamGone = false;
+
+                        if (b.TrackStatus == null)
+                            b.TrackStatus = new QueryTrackStatus(WorkingDirectory, b.Head, upstreamHead).Result();
+                    }
+                    else
+                    {
+                        b.IsUpstreamGone = true;
+
+                        if (b.TrackStatus == null)
+                            b.TrackStatus = new Models.BranchTrackStatus();
+                    }                        
+                }
             }
 
             return branches;
@@ -93,9 +108,10 @@ private Models.Branch ParseLine(string line)
             branch.Upstream = parts[4];
             branch.IsUpstreamGone = false;
 
-            if (branch.IsLocal && !string.IsNullOrEmpty(parts[5]) && !parts[5].Equals("=", StringComparison.Ordinal))
-                branch.TrackStatus = new QueryTrackStatus(WorkingDirectory, branch.Name, branch.Upstream).Result();
-            else
+            if (!branch.IsLocal ||
+                string.IsNullOrEmpty(branch.Upstream) ||
+                string.IsNullOrEmpty(parts[5]) ||
+                parts[5].Equals("=", StringComparison.Ordinal))
                 branch.TrackStatus = new Models.BranchTrackStatus();
 
             return branch;