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

feat(git): add MergeAbortAsync

Browse Source
This commit is contained in:
Mika Kuns
2026-04-22 09:29:24 +02:00
parent 3ebbdb3f6e
commit 21a1870fd7
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ClaudeDo.Data/Git/GitService.cs
View File

@@ -191,6 +191,13 @@ public sealed class GitService
return (exitCode, stderr); return (exitCode, stderr);
} }
public async Task MergeAbortAsync(string repoDir, CancellationToken ct = default)
{
var (exitCode, _, stderr) = await RunGitAsync(repoDir, ["merge", "--abort"], ct);
if (exitCode != 0)
throw new InvalidOperationException($"git merge --abort failed (exit {exitCode}): {stderr}");
}
public async Task MergeFfOnlyAsync(string repoDir, string branchName, CancellationToken ct = default) public async Task MergeFfOnlyAsync(string repoDir, string branchName, CancellationToken ct = default)
{ {
var (exitCode, _, stderr) = await RunGitAsync(repoDir, ["merge", "--ff-only", branchName], ct); var (exitCode, _, stderr) = await RunGitAsync(repoDir, ["merge", "--ff-only", branchName], ct);

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

@@ -129,4 +129,29 @@ public class GitServiceMergeTests : IDisposable
Assert.NotEqual(0, exitCode); Assert.NotEqual(0, exitCode);
} }
[Fact]
public async Task MergeAbortAsync_AfterConflict_ClearsMergeState()
{
if (!GitRepoFixture.IsGitAvailable()) return;
var repo = NewRepo();
GitRepoFixture.RunGit(repo.RepoDir, "checkout", "-b", "feature/abort");
File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "# feat side\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "edit");
try { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "main"); }
catch { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "master"); }
File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "# main side\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "edit");
var git = new GitService();
await git.MergeNoFfAsync(repo.RepoDir, "feature/abort", "merge"); // will conflict
Assert.True(await git.IsMidMergeAsync(repo.RepoDir));
await git.MergeAbortAsync(repo.RepoDir);
Assert.False(await git.IsMidMergeAsync(repo.RepoDir));
}
} }