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

feat(git): add MergeNoFfAsync returning (exitCode, stderr)

Browse Source
This commit is contained in:
Mika Kuns
2026-04-22 09:27:47 +02:00
parent 535d0c5558
commit 3ebbdb3f6e
2 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,4 +72,61 @@ public class GitServiceMergeTests : IDisposable
var git = new GitService();
Assert.True(await git.IsMidMergeAsync(repo.RepoDir));
}
[Fact]
public async Task MergeNoFfAsync_DivergedNonConflicting_ReturnsZero_AndCreatesMergeCommit()
{
if (!GitRepoFixture.IsGitAvailable()) return;
var repo = NewRepo();
// Create a feature branch with one new file.
GitRepoFixture.RunGit(repo.RepoDir, "checkout", "-b", "feature/merge");
File.WriteAllText(Path.Combine(repo.RepoDir, "feature.txt"), "hello\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "feat: add feature.txt");
// Back to default and add a non-overlapping file so history diverges.
string defaultBranch;
try { defaultBranch = GitRepoFixture.RunGit(repo.RepoDir, "symbolic-ref", "--short", "refs/remotes/origin/HEAD").Trim().Replace("origin/", ""); }
catch { defaultBranch = "main"; }
if (string.IsNullOrEmpty(defaultBranch)) defaultBranch = "main";
try { GitRepoFixture.RunGit(repo.RepoDir, "checkout", defaultBranch); }
catch { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "master"); defaultBranch = "master"; }
File.WriteAllText(Path.Combine(repo.RepoDir, "other.txt"), "other\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "chore: add other.txt");
var git = new GitService();
var (exitCode, stderr) = await git.MergeNoFfAsync(repo.RepoDir, "feature/merge", "Merge feature/merge");
Assert.Equal(0, exitCode);
// Confirm merge commit exists (two parents on HEAD).
var parents = GitRepoFixture.RunGit(repo.RepoDir, "rev-list", "--parents", "-n", "1", "HEAD").Trim();
Assert.True(parents.Split(' ').Length >= 3, $"Expected merge commit (3 tokens), got: '{parents}'");
}
[Fact]
public async Task MergeNoFfAsync_Conflict_ReturnsNonZero()
{
if (!GitRepoFixture.IsGitAvailable()) return;
var repo = NewRepo();
// Both branches modify README.md — guaranteed conflict.
GitRepoFixture.RunGit(repo.RepoDir, "checkout", "-b", "feature/conflict");
File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "# feature side\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "feat: feature edit");
string defaultBranch = "main";
try { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "main"); }
catch { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "master"); defaultBranch = "master"; }
File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "# main side\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "chore: main edit");
var git = new GitService();
var (exitCode, _) = await git.MergeNoFfAsync(repo.RepoDir, "feature/conflict", "merge");
Assert.NotEqual(0, exitCode);
}
}