fix(data): merge preflights ignore untracked files in target working tree

HasChangesAsync counted untracked files, so a stray file in the shared target working dir (e.g. left by a concurrent session) blocked merge preflights even though nothing tracked changed. Add an includeUntracked overload defaulting to true, and pass includeUntracked: false only from the two target-working-tree merge preflights (TaskMergeService.MergeAsync, PlanningMergeOrchestrator.StartAsync). Auto-commit and the worktree cleanup data-loss guard keep counting untracked files, since those callers need to know about them.
2026-07-23 18:14:46 +02:00
parent f18e03354a
commit 14e4c086e2
7 changed files with 102 additions and 8 deletions
@@ -168,6 +168,39 @@ public class GitServiceMergeTests : IDisposable
        Assert.Equal("feature/checkout-test", current);
    }

+    [Fact]
+    public async Task HasChangesAsync_UntrackedFileOnly_DefaultReturnsTrue()
+    {
+        if (!GitRepoFixture.IsGitAvailable()) return;
+        var repo = NewRepo();
+        File.WriteAllText(Path.Combine(repo.RepoDir, "untracked.txt"), "new\n");
+
+        var git = new GitService();
+        Assert.True(await git.HasChangesAsync(repo.RepoDir));
+    }
+
+    [Fact]
+    public async Task HasChangesAsync_UntrackedFileOnly_IncludeUntrackedFalse_ReturnsFalse()
+    {
+        if (!GitRepoFixture.IsGitAvailable()) return;
+        var repo = NewRepo();
+        File.WriteAllText(Path.Combine(repo.RepoDir, "untracked.txt"), "new\n");
+
+        var git = new GitService();
+        Assert.False(await git.HasChangesAsync(repo.RepoDir, includeUntracked: false));
+    }
+
+    [Fact]
+    public async Task HasChangesAsync_ModifiedTrackedFile_IncludeUntrackedFalse_StillReturnsTrue()
+    {
+        if (!GitRepoFixture.IsGitAvailable()) return;
+        var repo = NewRepo();
+        File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "changed\n");
+
+        var git = new GitService();
+        Assert.True(await git.HasChangesAsync(repo.RepoDir, includeUntracked: false));
+    }
+
    [Fact]
    public async Task ListConflictedFilesAsync_MidConflict_ReturnsConflictedFile()
    {