fix: PR #1501

- returns `null` to fallback to git's `merge.ff` configure when user does not configure `Preferred Merge Mode`
- since `GetGitConfigBranchMergeOptions` is the last one, returns `Default` as fallback

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

Author: love-linger

src/ViewModels/Merge.cs

@@ -85,42 +85,40 @@ private Models.MergeMode AutoSelectMergeMode()
             return
                 GetGitConfigBranchMergeOptions() // Branch
                 ?? GetSettingsPreferredMergeMode() // Repository
-                ?? GetGitConfigMergeFF() // Global
-                ?? Models.MergeMode.Default; // Fallback
+                ?? GetGitConfigMergeFF(); // Global
+        }
+
+        private Models.MergeMode GetGitConfigBranchMergeOptions()
+        {
+            var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
+            return config switch
+            {
+                null or "" => null,
+                "--ff-only" => Models.MergeMode.FastForward,
+                "--no-ff" => Models.MergeMode.NoFastForward,
+                "--squash" => Models.MergeMode.Squash,
+                "--no-commit" or "--no-ff --no-commit" => Models.MergeMode.DontCommit,
+                _ => null
+            };
         }
 
         private Models.MergeMode GetSettingsPreferredMergeMode()
         {
             var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode;
             if (preferredMergeModeIdx < 0 || preferredMergeModeIdx > Models.MergeMode.Supported.Length)
-                return Models.MergeMode.Supported[preferredMergeModeIdx];
+                return null;
 
-            return Models.MergeMode.Default;
+            return Models.MergeMode.Supported[preferredMergeModeIdx];
         }
 
         private Models.MergeMode GetGitConfigMergeFF()
         {
             var config = new Commands.Config(_repo.FullPath).Get("merge.ff");
             return config switch
             {
-                null or "" => null,
                 "false" => Models.MergeMode.NoFastForward,
                 "only" => Models.MergeMode.FastForward,
-                _ => null
-            };
-        }
-
-        private Models.MergeMode GetGitConfigBranchMergeOptions()
-        {
-            var config = new Commands.Config(_repo.FullPath).Get($"branch.{Into}.mergeoptions");
-            return config switch
-            {
-                null or "" => null,
-                "--ff-only" => Models.MergeMode.FastForward,
-                "--no-ff" => Models.MergeMode.NoFastForward,
-                "--squash" => Models.MergeMode.Squash,
-                "--no-commit" or "--no-ff --no-commit" => Models.MergeMode.DontCommit,
-                _ => null
+                _ => Models.MergeMode.Default
             };
         }