commit signing hell

This commit is contained in:
Ian Gulliver
2026-10-18 22:55:23 -07:00
parent 95389d0d92
commit 380e533ef4
8 changed files with 402 additions and 280 deletions
+1 -1
View File
@@ -123,7 +123,7 @@ func (m *Manager) pushToMain(ctx context.Context, l *live, task api.Task, projec
"GIT_COMMITTER_NAME=" + user.GitName,
"GIT_COMMITTER_EMAIL=" + user.GitEmail,
}
commit, err := git.SquashCommit(project.RepoPath, l.dir, project.DefaultBranch, squashMessage(title, coAuthors), env)
commit, err := git.SquashCommit(project.RepoPath, l.dir, project.DefaultBranch, squashMessage(title, coAuthors), env, m.signer(ctx, user))
conflict := &git.ConflictError{}
if errors.As(err, &conflict) {
return "", fmt.Errorf("%w; run `git merge --no-ff --no-commit %s`, resolve them, and call merge_to_main again", err, project.DefaultBranch)