releases/ClaudeDo
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

feat(git): add IsMidMergeAsync

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/ClaudeDo.Worker.Tests/Runner/GitServiceMergeTests.cs
View File

@@ -49,4 +49,27 @@ public class GitServiceMergeTests : IDisposable
Assert.Contains("feature/x", branches);
Assert.True(branches.Any(b => b == "main" || b == "master"));
}
[Fact]
public async Task IsMidMergeAsync_FreshRepo_ReturnsFalse()
{
if (!GitRepoFixture.IsGitAvailable()) return;
var repo = NewRepo();
var git = new GitService();
Assert.False(await git.IsMidMergeAsync(repo.RepoDir));
}
[Fact]
public async Task IsMidMergeAsync_MergeHeadPresent_ReturnsTrue()
{
if (!GitRepoFixture.IsGitAvailable()) return;
var repo = NewRepo();
// Simulate a mid-merge state by dropping a MERGE_HEAD file.
var mergeHead = Path.Combine(repo.RepoDir, ".git", "MERGE_HEAD");
File.WriteAllText(mergeHead, "0000000000000000000000000000000000000000\n");
var git = new GitService();
Assert.True(await git.IsMidMergeAsync(repo.RepoDir));
}
}