Skip to content

Fix: Checked out existing local branch when checking out remote branch #18761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManyaS-Git wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

Fix: Checked out existing local branch when checking out remote branch #18761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Files.App/Services/Git/LibGit2Service.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,15 @@ private static void CheckoutRemoteBranch(Repository repository, Branch branch)
{
var uniqueName = branch.FriendlyName.Substring(END_OF_ORIGIN_PREFIX);

// TODO: This is a temp fix to avoid an issue where Files would create many branches in a loop
if (repository.Branches.Any(b => !b.IsRemote && b.FriendlyName == uniqueName))
{
var localBranch = repository.Branches[uniqueName];
if (repository.Head.FriendlyName != localBranch.FriendlyName)
{
LibGit2Sharp.Commands.Checkout(repository, localBranch);
}
return;
}

//var discriminator = 0;
//while (repository.Branches.Any(b => !b.IsRemote && b.FriendlyName == uniqueName))
Expand Down
8 changes: 7 additions & 1 deletion src/Files.App/Utils/Git/GitHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,15 @@ private static void CheckoutRemoteBranch(Repository repository, Branch branch)
{
var uniqueName = branch.FriendlyName.Substring(END_OF_ORIGIN_PREFIX);

// TODO: This is a temp fix to avoid an issue where Files would create many branches in a loop
if (repository.Branches.Any(b => !b.IsRemote && b.FriendlyName == uniqueName))
{
var localBranch = repository.Branches[uniqueName];
if (repository.Head.FriendlyName != localBranch.FriendlyName)
{
LibGit2Sharp.Commands.Checkout(repository, localBranch);
}
return;
}

//var discriminator = 0;
//while (repository.Branches.Any(b => !b.IsRemote && b.FriendlyName == uniqueName))
Expand Down