dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-20 19:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix<Discard>: wrong discard behavior with changes both in worktree and staged

Browse source
This commit is contained in:
leo 2024-03-01 11:34:32 +08:00
parent a770ff542d
commit 1c005983c7
4 changed files with 58 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Views/TextDiffView.axaml.cs
View file

@ -680,7 +680,7 @@ namespace SourceGit.Views {
discard.Icon = App.CreateMenuIcon("Icons.Undo");
discard.Click += (_, e) => {
var workcopy = workcopyView.DataContext as ViewModels.WorkingCopy;
workcopy.Discard(new List<Models.Change> { change });
workcopy.Discard(new List<Models.Change> { change }, true);
e.Handled = true;
};
@ -700,14 +700,8 @@ namespace SourceGit.Views {
discard.Header = App.Text("FileCM.DiscardSelectedLines");
discard.Icon = App.CreateMenuIcon("Icons.Undo");
discard.Click += (_, e) => {
var repoView = this.FindAncestorOfType<Repository>();
if (repoView == null) return;
var repo = repoView.DataContext as ViewModels.Repository;
repo.SetWatcherEnabled(false);
new Commands.Restore(repo.FullPath, new List<string> { change.Path }, "--staged --worktree").Exec();
repo.RefreshWorkingCopyChanges();
repo.SetWatcherEnabled(true);
var workcopy = workcopyView.DataContext as ViewModels.WorkingCopy;
workcopy.Discard(new List<Models.Change> { change }, false);
e.Handled = true;
};