Let the agent set the merge commit title, defaulting to the task title

This commit is contained in:
Ian Gulliver
2026-10-14 21:21:54 -07:00
parent 73f6dd73d2
commit 01c60d6618
24 changed files with 373 additions and 202 deletions
+3 -2
View File
@@ -612,9 +612,10 @@ func TestMergeResolvesConflict(t *testing.T) {
if parent := gitOut(t, e.repo, "rev-parse", "main^"); parent != moved {
t.Fatalf("merge commit parent %s, want %s", parent, moved)
}
if log := gitOut(t, e.repo, "log", "-1", "--format=%s|%an|%cn"); log != task.Title+"|"+gitName+"|"+gitName {
t.Fatalf("unexpected merge commit %s", log)
if log := gitOut(t, e.repo, "log", "-1", "--format=%s|%b|%an|%cn"); log != task.MergeTitle+"||"+gitName+"|"+gitName {
t.Fatalf("unexpected merge commit %s, want title %q", log, task.MergeTitle)
}
t.Logf("merge commit title: %s", task.MergeTitle)
notes, err := os.ReadFile(filepath.Join(e.repo, "notes.txt"))
if err != nil {
t.Fatalf("read notes.txt: %v", err)