dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-22 10:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-17 19:53:47 +08:00
parent 2b95ea2ab1
commit a0cddaea80
No known key found for this signature in database
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/ViewModels/Merge.cs
View file

@ -21,14 +21,14 @@ namespace SourceGit.ViewModels
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 @@ namespace SourceGit.ViewModels
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];
}