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

enhance: disable Fast-Forward for worktree which is not current branch

Browse source
This commit is contained in:
leo 2024-10-21 16:39:57 +08:00
parent 3b1a54dffd
commit a5e783da08
No known key found for this signature in database
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ViewModels/Repository.cs
View file

@ -1355,8 +1355,9 @@ namespace SourceGit.ViewModels
}; };
menu.Items.Add(checkout); menu.Items.Add(checkout);
var worktree = _worktrees.Find(x => x.Branch == branch.FullName);
var upstream = _branches.Find(x => x.FullName == branch.Upstream); var upstream = _branches.Find(x => x.FullName == branch.Upstream);
if (upstream != null) if (upstream != null && worktree == null)
{ {
var fastForward = new MenuItem(); var fastForward = new MenuItem();
fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream.FriendlyName); fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream.FriendlyName);