mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-06-16 16:05:00 +00:00
refactor: query branch head after operation finished to avoid branch head mismatch
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
9fb8af51ff
commit
c112549b69
5 changed files with 25 additions and 17 deletions
|
@ -922,17 +922,17 @@ namespace SourceGit.ViewModels
|
|||
}
|
||||
}
|
||||
|
||||
public void NavigateToCommitDelayed(string sha)
|
||||
{
|
||||
_navigateToCommitDelayed = sha;
|
||||
}
|
||||
|
||||
public void NavigateToCurrentHead()
|
||||
{
|
||||
if (_currentBranch != null)
|
||||
NavigateToCommit(_currentBranch.Head);
|
||||
}
|
||||
|
||||
public void NavigateToBranchDelayed(string branch)
|
||||
{
|
||||
_navigateToBranchDelayed = branch;
|
||||
}
|
||||
|
||||
public void ClearHistoriesFilter()
|
||||
{
|
||||
_settings.HistoriesFilters.Clear();
|
||||
|
@ -1189,15 +1189,11 @@ namespace SourceGit.ViewModels
|
|||
|
||||
BisectState = _histories.UpdateBisectInfo();
|
||||
|
||||
if (!string.IsNullOrEmpty(_navigateToBranchDelayed))
|
||||
{
|
||||
var branch = _branches.Find(x => x.FullName == _navigateToBranchDelayed);
|
||||
if (branch != null)
|
||||
NavigateToCommit(branch.Head);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(_navigateToCommitDelayed))
|
||||
NavigateToCommit(_navigateToCommitDelayed);
|
||||
}
|
||||
|
||||
_navigateToBranchDelayed = string.Empty;
|
||||
_navigateToCommitDelayed = string.Empty;
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -2937,6 +2933,6 @@ namespace SourceGit.ViewModels
|
|||
private Models.BisectState _bisectState = Models.BisectState.None;
|
||||
private bool _isBisectCommandRunning = false;
|
||||
|
||||
private string _navigateToBranchDelayed = string.Empty;
|
||||
private string _navigateToCommitDelayed = string.Empty;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue