Skip to content

Add new two-phase Rebase RPC

Luke Duncalfe requested to merge add-new-rebase into master

This MR adds a new Rebase RPC which is two-phase. It yields the rebase commit SHA to the client after the first request, and expects the client to make a second request with Apply: true for the session to be complete.

Issue https://gitlab.com/gitlab-org/gitlab-ee/issues/5966#note_150894306

Notes:

  • The new RPC name will be changed to be prefixed with User. I've polled #g_gitaly and at time of writing UserRebaseConfirm is a front-runner!
  • This is the corresponding gitaly-proto MR gitaly-proto!293 (merged)
  • More tests should be written. I was having some trouble with testing the preRecieveError and gitError scenarios!
Edited by GitLab Release Tools Bot

Merge request reports