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

fix: GetCanStagedChanges should allow stage conflict that has been resolved manually (#1621)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-07-25 17:28:50 +08:00
parent d170bf6499
commit c7a01f646f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ViewModels/WorkingCopy.cs
View File

@@ -345,7 +345,7 @@ namespace SourceGit.ViewModels
public async Task StageChangesAsync(List<Models.Change> changes, Models.Change next)
{
var canStaged = GetCanStagedChanges(changes);
var canStaged = await GetCanStageChangesAsync(changes);
var count = canStaged.Count;
if (count == 0)
return;
@@ -645,7 +645,7 @@ namespace SourceGit.ViewModels
return visible;
}
private List<Models.Change> GetCanStagedChanges(List<Models.Change> changes)
private async Task<List<Models.Change>> GetCanStageChangesAsync(List<Models.Change> changes)
{
if (!HasUnsolvedConflicts)
return changes;
@@ -653,8 +653,20 @@ namespace SourceGit.ViewModels
var outs = new List<Models.Change>();
foreach (var c in changes)
{
if (!c.IsConflicted)
outs.Add(c);
if (c.IsConflicted)
{
var isResolved = c.ConflictReason switch
{
Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified =>
await new Commands.IsConflictResolved(_repo.FullPath, c).GetResultAsync(),
_ => false,
};
if (!isResolved)
continue;
}
outs.Add(c);
}
return outs;