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

fix<WorkingCopy>: unselect items before checking conflicts

Browse source
This commit is contained in:
leo 2021-05-08 09:48:53 +08:00
parent b5c623a51b
commit 08f279a521
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Views/Widgets/WorkingCopy.xaml.cs
View file

@ -112,25 +112,21 @@ namespace SourceGit.Views.Widgets {
return;
}
if (container.IsUnstaged) {
stagedContainer.UnselectAll();
} else {
unstagedContainer.UnselectAll();
}
var change = e.Target;
if (change.IsConflit) {
mergePanel.Visibility = Visibility.Visible;
diffViewer.Reset();
return;
}
mergePanel.Visibility = Visibility.Collapsed;
if (!container.IsUnstaged) {
unstagedContainer.UnselectAll();
diffViewer.Diff(repo.Path, new DiffViewer.Option() {
ExtraArgs = "--cached",
Path = change.Path,
OrgPath = change.OriginalPath
});
} else {
stagedContainer.UnselectAll();
if (container.IsUnstaged) {
switch (change.WorkTree) {
case Models.Change.Status.Added:
case Models.Change.Status.Untracked:
@ -147,6 +143,12 @@ namespace SourceGit.Views.Widgets {
});
break;
}
} else {
diffViewer.Diff(repo.Path, new DiffViewer.Option() {
ExtraArgs = "--cached",
Path = change.Path,
OrgPath = change.OriginalPath
});
}
}
#endregion