dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-22 02:45:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: prevent unintended amend behavior when changing current branch

Browse source
This commit is contained in:
Gadfly 2025-04-14 21:56:59 +08:00
parent b9e8ab7345
commit 83625b396b
No known key found for this signature in database
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ViewModels/Repository.cs
View file

@ -162,7 +162,15 @@ namespace SourceGit.ViewModels
public Models.Branch CurrentBranch public Models.Branch CurrentBranch
{ {
get => _currentBranch; get => _currentBranch;
private set => SetProperty(ref _currentBranch, value); private set
{
var oldHead = _currentBranch?.Head;
if (SetProperty(ref _currentBranch, value))
{
if (oldHead != _currentBranch.Head && _workingCopy is { UseAmend: true })
_workingCopy.UseAmend = false;
}
}
} }
public List<BranchTreeNode> LocalBranchTrees public List<BranchTreeNode> LocalBranchTrees