michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

enhance: supports default remote in Pull if current branch has no upstream (#534)

Browse source
This commit is contained in:
leo 2024-10-02 15:27:09 +08:00
parent d746e352a7
commit a59600ce18
No known key found for this signature in database
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ViewModels/Pull.cs
View file

@ -95,7 +95,18 @@ namespace SourceGit.ViewModels
} }
} }
_selectedRemote = autoSelectedRemote ?? repo.Remotes[0]; if (autoSelectedRemote == null)
{
var remote = null as Models.Remote;
if (!string.IsNullOrEmpty(_repo.Settings.DefaultRemote))
remote = _repo.Remotes.Find(x => x.Name == _repo.Settings.DefaultRemote);
_selectedRemote = remote ?? _repo.Remotes[0];
}
else
{
_selectedRemote = autoSelectedRemote;
}
PostRemoteSelected(); PostRemoteSelected();
HasSpecifiedRemoteBranch = false; HasSpecifiedRemoteBranch = false;
} }
@ -132,7 +143,7 @@ namespace SourceGit.ViewModels
} }
} }
var rs = false; bool rs;
if (FetchAllBranches) if (FetchAllBranches)
{ {
SetProgressDescription($"Fetching remote: {_selectedRemote.Name}..."); SetProgressDescription($"Fetching remote: {_selectedRemote.Name}...");