github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-30 13:51:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: manually update local branch tree after checking out and fast-forward a exiting local branch (#2169)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-03-17 10:49:43 +08:00
parent c47f819ac2
commit 5fdd4e3189
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/ViewModels/CheckoutAndFastForward.cs
View File

@@ -80,17 +80,19 @@ namespace SourceGit.ViewModels
await new Commands.Stash(_repo.FullPath)
.Use(log)
.PopAsync("stash@{0}");
LocalBranch.Behind.Clear();
LocalBranch.Head = RemoteBranch.Head;
LocalBranch.CommitterDate = RemoteBranch.CommitterDate;
_repo.FastRefreshBranchesAfterCheckout(LocalBranch);
}
else
{
_repo.MarkWorkingCopyDirtyManually();
}
log.Complete();
if (_repo.HistoryFilterMode == Models.FilterMode.Included)
_repo.SetBranchFilterMode(LocalBranch, Models.FilterMode.Included, false, false);
_repo.MarkBranchesDirtyManually();
ProgressDescription = "Waiting for branch updated...";
await Task.Delay(400);
return succ;
}