ci: Configure git identity before rebase in push retry#404
Merged
andygrunwald merged 1 commit intoMay 9, 2026
Conversation
The push-with-retry step calls `git pull --rebase origin main` to recover from concurrent pushes to `main`. Rebase replays commits and therefore needs `user.name` / `user.email` in git config. The `stefanzweifel/git-auto-commit-action` only sets those inline for its own `git commit` invocation, so the next shell step has no identity and the rebase aborts with "empty ident name (for <runner@...>) not allowed". Persist the identity at the repo level — using the same name and email already configured on the auto-commit step — before the retry loop runs. Mirrors the fix landed in EngineeringKiosk/awesome-software-engineering-games. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Configure git identity for rebasestep between the auto-commit step and thePush changes with retryretry loop in.github/workflows/podcast-data.yml.user.name/user.emailto the same values already advertised onstefanzweifel/git-auto-commit-action(GitHub Actions Bot <actions@github.com>), sogit pull --rebaseinside the retry loop has a committer identity to replay commits with.Why
The retry loop introduced to handle concurrent pushes to
maincallsgit pull --rebase origin main. Rebase needs a committer identity in git config.stefanzweifel/git-auto-commit-actiononly sets identity inline for its owngit commit(viagit -c …) and does not persist it, so the next shell step starts without one and aborts with:Same root cause and fix as EngineeringKiosk/awesome-software-engineering-games#53.
Test plan
main.Podcast dataviaworkflow_dispatchfrom the Actions tab.Configure git identity for rebasestep runs (or is skipped when no changes were detected).Push changes with retrysucceeds without theempty ident nameerror, including in the rebase path if a concurrent push lands.🤖 Generated with Claude Code