fix: prevent unintended amend behavior when changing current branch

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

View file

@ -162,7 +162,15 @@ namespace SourceGit.ViewModels
public Models.Branch 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