feat(git): add IsMidMergeAsync

This commit is contained in:
Mika Kuns
2026-04-22 09:25:10 +02:00
parent 2d807aa606
commit 535d0c5558
2 changed files with 33 additions and 0 deletions

View File

@@ -173,6 +173,16 @@ public sealed class GitService
.ToList();
}
public async Task<bool> IsMidMergeAsync(string repoDir, CancellationToken ct = default)
{
var (exitCode, stdout, _) = await RunGitAsync(repoDir, ["rev-parse", "--git-dir"], ct);
if (exitCode != 0) return false;
var gitDir = stdout.Trim();
if (!Path.IsPathRooted(gitDir))
gitDir = Path.Combine(repoDir, gitDir);
return File.Exists(Path.Combine(gitDir, "MERGE_HEAD"));
}
public async Task MergeFfOnlyAsync(string repoDir, string branchName, CancellationToken ct = default)
{
var (exitCode, _, stderr) = await RunGitAsync(repoDir, ["merge", "--ff-only", branchName], ct);