feature: support --ff-only option for git merge command

Signed-off-by: leo <[email protected]>

Author: love-linger

src/Models/MergeMode.cs

@@ -5,6 +5,7 @@ public class MergeMode
         public static readonly MergeMode[] Supported =
         [
             new MergeMode("Default", "Fast-forward if possible", ""),
+            new MergeMode("Fast-forward", "Refuse to merge when fast-forward is not possible", "--ff-only"),
             new MergeMode("No Fast-forward", "Always create a merge commit", "--no-ff"),
             new MergeMode("Squash", "Squash merge", "--squash"),
             new MergeMode("Don't commit", "Merge without commit", "--no-ff --no-commit"),

src/ViewModels/Histories.cs

@@ -871,7 +871,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
                         return;
 
                     if (_repo.CanCreatePopup())
-                        _repo.ShowAndStartPopup(new Merge(_repo, b, current.Name));
+                        _repo.ShowAndStartPopup(new Merge(_repo, b, current.Name, true));
 
                     e.Handled = true;
                 };
@@ -972,7 +972,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
                 merge.Click += (_, e) =>
                 {
                     if (_repo.CanCreatePopup())
-                        _repo.ShowPopup(new Merge(_repo, branch, current.Name));
+                        _repo.ShowPopup(new Merge(_repo, branch, current.Name, false));
                     e.Handled = true;
                 };
                 submenu.Items.Add(merge);
@@ -1060,7 +1060,7 @@ private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models
             merge.Click += (_, e) =>
             {
                 if (_repo.CanCreatePopup())
-                    _repo.ShowPopup(new Merge(_repo, branch, current.Name));
+                    _repo.ShowPopup(new Merge(_repo, branch, current.Name, false));
                 e.Handled = true;
             };
 

src/ViewModels/Merge.cs

@@ -21,14 +21,14 @@ public Models.MergeMode Mode
             set;
         }
 
-        public Merge(Repository repo, Models.Branch source, string into)
+        public Merge(Repository repo, Models.Branch source, string into, bool forceFastForward)
         {
             _repo = repo;
             _sourceName = source.FriendlyName;
 
             Source = source;
             Into = into;
-            Mode = AutoSelectMergeMode();
+            Mode = forceFastForward ? Models.MergeMode.Supported[1] : AutoSelectMergeMode();
             View = new Views.Merge() { DataContext = this };
         }
 
@@ -72,12 +72,14 @@ private Models.MergeMode AutoSelectMergeMode()
             var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
             if (string.IsNullOrEmpty(config))
                 return Models.MergeMode.Supported[0];
-            if (config.Equals("--no-ff", StringComparison.Ordinal))
+            if (config.Equals("--ff-only", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[1];
-            if (config.Equals("--squash", StringComparison.Ordinal))
+            if (config.Equals("--no-ff", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[2];
-            if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
+            if (config.Equals("--squash", StringComparison.Ordinal))
                 return Models.MergeMode.Supported[3];
+            if (config.Equals("--no-commit", StringComparison.Ordinal) || config.Equals("--no-ff --no-commit", StringComparison.Ordinal))
+                return Models.MergeMode.Supported[4];
 
             return Models.MergeMode.Supported[0];
         }

src/ViewModels/Repository.cs

@@ -1516,7 +1516,7 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
                                 return;
 
                             if (CanCreatePopup())
-                                ShowAndStartPopup(new Merge(this, b, branch.Name));
+                                ShowAndStartPopup(new Merge(this, b, branch.Name, true));
 
                             e.Handled = true;
                         };
@@ -1595,7 +1595,7 @@ public ContextMenu CreateContextMenuForLocalBranch(Models.Branch branch)
                     merge.Click += (_, e) =>
                     {
                         if (CanCreatePopup())
-                            ShowPopup(new Merge(this, branch, _currentBranch.Name));
+                            ShowPopup(new Merge(this, branch, _currentBranch.Name, false));
                         e.Handled = true;
                     };
 
@@ -1876,7 +1876,7 @@ public ContextMenu CreateContextMenuForRemoteBranch(Models.Branch branch)
                 merge.Click += (_, e) =>
                 {
                     if (CanCreatePopup())
-                        ShowPopup(new Merge(this, branch, _currentBranch.Name));
+                        ShowPopup(new Merge(this, branch, _currentBranch.Name, false));
                     e.Handled = true;
                 };