fix: merge.ff is ignored (#1501)

sina-hide · web-flow · commit 35d681dd50e6 · 2025-07-03T15:20:03.000+08:00
After changing the priority of the preferences/configurations for the merge mode in #1495, the git configuration `merge.ff` was ignored. The reason is, that `GetSettingsPreferredMergeMode()` does not return `null` in the default case. This is now fixed.
diff --git a/src/ViewModels/Merge.cs b/src/ViewModels/Merge.cs
@@ -85,17 +85,17 @@ private Models.MergeMode AutoSelectMergeMode()
             return
                 GetGitConfigBranchMergeOptions() // Branch
                 ?? GetSettingsPreferredMergeMode() // Repository
-                ?? GetGitConfigMergeFF(); // Global
+                ?? GetGitConfigMergeFF() // Global
+                ?? Models.MergeMode.Default; // Fallback
         }
 
         private Models.MergeMode GetSettingsPreferredMergeMode()
         {
             var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode;
             if (preferredMergeModeIdx < 0 || preferredMergeModeIdx > Models.MergeMode.Supported.Length)
-                preferredMergeModeIdx = 0;
+                return Models.MergeMode.Supported[preferredMergeModeIdx];
 
-            var defaultMergeMode = Models.MergeMode.Supported[preferredMergeModeIdx];
-            return defaultMergeMode;
+            return Models.MergeMode.Default;
         }
 
         private Models.MergeMode GetGitConfigMergeFF()

Original file line number	Diff line number	Diff line change
`@@ -85,17 +85,17 @@ private Models.MergeMode AutoSelectMergeMode()`
`85`	`85`	`return`
`86`	`86`	`GetGitConfigBranchMergeOptions() // Branch`
`87`	`87`	`?? GetSettingsPreferredMergeMode() // Repository`
`88`		`- ?? GetGitConfigMergeFF(); // Global`
	`88`	`+ ?? GetGitConfigMergeFF() // Global`
	`89`	`+ ?? Models.MergeMode.Default; // Fallback`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`private Models.MergeMode GetSettingsPreferredMergeMode()`
`92`	`93`	`{`
`93`	`94`	`var preferredMergeModeIdx = _repo.Settings.PreferredMergeMode;`
`94`	`95`	`if (preferredMergeModeIdx < 0 \|\| preferredMergeModeIdx > Models.MergeMode.Supported.Length)`
`95`		`- preferredMergeModeIdx = 0;`
	`96`	`+ return Models.MergeMode.Supported[preferredMergeModeIdx];`
`96`	`97`
`97`		`- var defaultMergeMode = Models.MergeMode.Supported[preferredMergeModeIdx];`
`98`		`- return defaultMergeMode;`
	`98`	`+ return Models.MergeMode.Default;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private Models.MergeMode GetGitConfigMergeFF()`