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

enhance: leave remote branch to empty when the local branch tracks no branch in the remote while pulling changes (#469)

Browse source
This commit is contained in:
leo 2024-09-13 17:27:56 +08:00
parent ab8b27c1f8
commit 1ec5cc416d
No known key found for this signature in database
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ViewModels/Pull.cs
View file

@ -210,7 +210,7 @@ namespace SourceGit.ViewModels
}
if (!autoSelectedBranch)
SelectedBranch = branches.Count > 0 ? branches[0] : null;
SelectedBranch = null;
}
private readonly Repository _repo = null;

7
src/ViewModels/Repository.cs
View file

@ -490,10 +490,11 @@ namespace SourceGit.ViewModels
return;
}
if (autoStart)
PopupHost.ShowAndStartPopup(new Pull(this, null));
var pull = new Pull(this, null);
if (autoStart && pull.SelectedBranch != null)
PopupHost.ShowAndStartPopup(pull);
else
PopupHost.ShowPopup(new Pull(this, null));
PopupHost.ShowPopup(pull);
}
public void Push(bool autoStart)