From a5e783da086b09246d1cde8728025039525ce1a5 Mon Sep 17 00:00:00 2001 From: leo Date: Mon, 21 Oct 2024 16:39:57 +0800 Subject: [PATCH] enhance: disable `Fast-Forward` for worktree which is not current branch --- src/ViewModels/Repository.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs index dcc40154..8fc56a38 100644 --- a/src/ViewModels/Repository.cs +++ b/src/ViewModels/Repository.cs @@ -1355,8 +1355,9 @@ namespace SourceGit.ViewModels }; menu.Items.Add(checkout); + var worktree = _worktrees.Find(x => x.Branch == branch.FullName); var upstream = _branches.Find(x => x.FullName == branch.Upstream); - if (upstream != null) + if (upstream != null && worktree == null) { var fastForward = new MenuItem(); fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream.FriendlyName);