Skip to content

Commit 1a2dc87

Browse files
committed
code_review: PR sourcegit-scm#2472
Count local branches while collecting it Signed-off-by: leo <longshuang@msn.cn>
1 parent 5a53e56 commit 1a2dc87

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

src/ViewModels/Repository.cs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ public void RefreshAfterCreateBranch(Models.Branch created, bool checkout)
761761
_watcher?.MarkBranchUpdated();
762762
_watcher?.MarkWorkingCopyUpdated();
763763

764-
_branches.RemoveAll(b => b.IsLocal && b.FriendlyName.Equals(created.FriendlyName, StringComparison.Ordinal));
764+
_branches.RemoveAll(b => b.IsLocal && b.Name.Equals(created.Name, StringComparison.Ordinal));
765765
_branches.Add(created);
766766

767767
if (checkout)
@@ -789,23 +789,21 @@ public void RefreshAfterCreateBranch(Models.Branch created, bool checkout)
789789
CurrentBranch = created;
790790
}
791791

792-
List<Models.Branch> locals = [];
792+
var locals = new List<Models.Branch>();
793+
var count = 0;
793794
foreach (var b in _branches)
794795
{
795796
if (b.IsLocal)
797+
{
796798
locals.Add(b);
799+
if (!b.IsDetachedHead)
800+
count++;
801+
}
797802
}
798803

799804
var builder = BuildBranchTree(locals, [], false);
800805
LocalBranchTrees = builder.Locals;
801-
802-
var localBranchesCount = 0;
803-
foreach (var b in locals)
804-
{
805-
if (!b.IsDetachedHead)
806-
localBranchesCount++;
807-
}
808-
LocalBranchesCount = localBranchesCount;
806+
LocalBranchesCount = count;
809807

810808
RefreshCommits();
811809
RefreshWorkingCopyChanges();

0 commit comments

Comments
 (0)