github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-20 21:01:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge.ff is ignored (#1501)

Browse Source 
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.
This commit is contained in:
Sina Hinderks
2025-07-03 09:20:03 +02:00
committed by GitHub
parent 3fe72e919c
commit 35d681dd50
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ViewModels/Merge.cs
View File

@@ -85,17 +85,17 @@ namespace SourceGit.ViewModels
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()