mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 12:15:00 +00:00
fix: discarding changes with selected changes should never be traited as Discard all changes
(#904)
This commit is contained in:
parent
90c04f1db2
commit
cb4ad63ba3
1 changed files with 1 additions and 6 deletions
|
@ -417,12 +417,7 @@ namespace SourceGit.ViewModels
|
||||||
public void Discard(List<Models.Change> changes)
|
public void Discard(List<Models.Change> changes)
|
||||||
{
|
{
|
||||||
if (_repo.CanCreatePopup())
|
if (_repo.CanCreatePopup())
|
||||||
{
|
_repo.ShowPopup(new Discard(_repo, changes));
|
||||||
if (changes.Count == _unstaged.Count && _staged.Count == 0)
|
|
||||||
_repo.ShowPopup(new Discard(_repo));
|
|
||||||
else
|
|
||||||
_repo.ShowPopup(new Discard(_repo, changes));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async void UseTheirs(List<Models.Change> changes)
|
public async void UseTheirs(List<Models.Change> changes)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue