michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-11-01 13:13:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: rewrite branch auto-select after remote changed while pulling (#342)

Browse source
This commit is contained in:
leo 2024-08-09 14:08:25 +08:00
parent f98423b4c7
commit 3a54471ea5
No known key found for this signature in database
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/ViewModels/Pull.cs
View file

@ -182,30 +182,29 @@ namespace SourceGit.ViewModels
RemoteBranches = branches;
var autoSelectedBranch = false;
if (!string.IsNullOrEmpty(_current.Upstream))
if (!string.IsNullOrEmpty(_current.Upstream) &&
_current.Upstream.StartsWith($"refs/remotes/{remoteName}/", System.StringComparison.Ordinal))
{
if (_current.Upstream.StartsWith($"refs/remotes/{remoteName}/", System.StringComparison.Ordinal))
foreach (var branch in branches)
{
foreach (var branch in branches)
if (_current.Upstream == branch.FullName)
{
if (_current.Upstream == branch.FullName)
{
SelectedBranch = branch;
autoSelectedBranch = true;
break;
}
SelectedBranch = branch;
autoSelectedBranch = true;
break;
}
}
else
}
if (!autoSelectedBranch)
{
foreach (var branch in branches)
{
foreach (var branch in branches)
if (_current.Name == branch.Name)
{
if (_current.Name == branch.Name)
{
SelectedBranch = branch;
autoSelectedBranch = true;
break;
}
SelectedBranch = branch;
autoSelectedBranch = true;
break;
}
}
}