Skip to content

refactor(runway): Run the git merger's commands through a gitworkspace.Workspace - #979

Draft
roychying wants to merge 1 commit into
chenghan.ying/runway-git-merger-workspacefrom
chenghan.ying/runway-git-merger-on-workspace
Draft

roychying wants to merge 1 commit into
chenghan.ying/runway-git-merger-workspacefrom
chenghan.ying/runway-git-merger-on-workspace

Conversation

@roychying

Copy link
Copy Markdown
Contributor

Why?

The Phabricator support RFC makes the git merger backend-neutral by running it on gitworkspace.Workspace. Today the merger builds local git processes itself, so no other backend can host it.

What?

  • The merger takes Params.Workspaces/Repo instead of a checkout path, runtime and committer. It opens one workspace per operation and runs each git command as a one-command batch. Strategy, conflict, retry and push logic are unchanged.
  • The author moves from GIT_AUTHOR_* to commit --author. MERGE becomes merge --no-commit + commit --author. Names containing <, > or a newline fall back to the committer.
  • The server builds a local workspace with the pinned runtime and committer, and now owns the committer defaults. The README is updated.

Test Plan

bazel test //runway/... //service/runway/...

Issue

@roychying
roychying added this pull request to stack #980 October 28, 2026 22:01

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant