fix: discarding changes with selected changes should never be traited as Discard all changes (#904)

love-linger · love-linger · commit cb4ad63ba358 · 2025-01-22T10:52:01.000+08:00
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -417,12 +417,7 @@ public async void UnstageChanges(List<Models.Change> changes, Models.Change next
         public void Discard(List<Models.Change> changes)
         {
             if (_repo.CanCreatePopup())
-            {
-                if (changes.Count == _unstaged.Count && _staged.Count == 0)
-                    _repo.ShowPopup(new Discard(_repo));
-                else
-                    _repo.ShowPopup(new Discard(_repo, changes));
-            }
+                _repo.ShowPopup(new Discard(_repo, changes));
         }
 
         public async void UseTheirs(List<Models.Change> changes)

Original file line number	Diff line number	Diff line change
`@@ -417,12 +417,7 @@ public async void UnstageChanges(List<Models.Change> changes, Models.Change next`
`417`	`417`	`public void Discard(List<Models.Change> changes)`
`418`	`418`	`{`
`419`	`419`	`if (_repo.CanCreatePopup())`
`420`		`- {`
`421`		`- if (changes.Count == _unstaged.Count && _staged.Count == 0)`
`422`		`- _repo.ShowPopup(new Discard(_repo));`
`423`		`- else`
`424`		`- _repo.ShowPopup(new Discard(_repo, changes));`
`425`		`- }`
	`420`	`+ _repo.ShowPopup(new Discard(_repo, changes));`
`426`	`421`	`}`
`427`	`422`
`428`	`423`	`public async void UseTheirs(List<Models.Change> changes)`