ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Fetch before Merge and push the squash commit to origin

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-14 22:45:02 -07:00
parent 4ffdc1e517
commit 8825d38695
17 changed files with 352 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/agents/mergein.go
+21 -3
View File
@@ -45,6 +45,11 @@ func (m *Manager) Merge(ctx context.Context, task api.Task, project api.Project,
return api.AgentSession{}, ErrNoGitIdentity
}
err := git.FetchFastForward(project.RepoPath, project.DefaultBranch)
if err != nil {
return api.AgentSession{}, err
}
m.mu.Lock()
m.merges[task.Id] = user.Login
m.mu.Unlock()
@@ -74,7 +79,7 @@ func (m *Manager) finishMerge(l *live, login string) {
}
slog.Error("finish merge", "task", l.taskID, "err", err)
m.fileError(l, "The agent merged the default branch in, but squashing onto it failed: "+err.Error())
m.fileError(l, "Merging the task failed: "+err.Error())
err = m.Deliver(ctx, l.id)
if err != nil {
slog.Error("deliver inbox responses", "session", l.id, "err", err)
@@ -95,7 +100,7 @@ func (m *Manager) squashAndClose(ctx context.Context, taskID, login string) erro
return err
}
commit, err := git.SquashMerge(project.RepoPath, task.WorktreePath, project.DefaultBranch, task.MergeTitle, []string{
commit, err := git.SquashCommit(project.RepoPath, task.WorktreePath, project.DefaultBranch, task.MergeTitle, []string{
"GIT_AUTHOR_NAME=" + user.GitName,
"GIT_AUTHOR_EMAIL=" + user.GitEmail,
"GIT_COMMITTER_NAME=" + user.GitName,
@@ -105,12 +110,25 @@ func (m *Manager) squashAndClose(ctx context.Context, taskID, login string) erro
return err
}
pushed := ""
if commit != "" {
err = git.Push(project.RepoPath, commit, project.DefaultBranch)
if err != nil {
return err
}
pushed = git.Remote + "/" + project.DefaultBranch
err = git.FastForward(project.RepoPath, commit)
if err != nil {
return fmt.Errorf("pushed %s to %s, but fast-forwarding the project checkout failed: %w", commit, pushed, err)
}
}
err = m.RemoveTask(ctx, task, project, login)
if err != nil {
return err
}
_, err = m.store.MergeTask(ctx, taskID, commit, login)
_, err = m.store.MergeTask(ctx, taskID, commit, pushed, login)
return err
}