Inspect changes in Gitaly 042a35ce7e9bd624b1f777d36eb3660e20f563e2
Upstream merge commit 54f75ea7b8f9 changes Gitaly server version from af2fbf3d304a0cd637f8b9ea47817b8c9b6f109b to 042a35ce7e9bd624b1f777d36eb3660e20f563e2, with changes in protocol or one of the source subtrees currently under watch.
The topic upstream-merge
is at 195 non-merge commits.
To further inspect, go to an up to date Gitaly source clone and run:
git diff af2fbf3d304a0cd637f8b9ea47817b8c9b6f109b..042a35ce7e9bd624b1f777d36eb3660e20f563e2 -- proto/*.proto internal/backup
Here is a preview, truncated at 500 lines:
diff --git a/proto/operations.proto b/proto/operations.proto
index 27a792572..72df2f6d8 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -745,6 +745,20 @@ message UserRevertResponse {
CreateTreeError create_tree_error_code = 5;
}
+// UserRevertError is an error returned by the UserRevert RPC.
+message UserRevertError {
+ oneof error {
+ // merge_conflict is returned if there is a conflict when applying the revert.
+ MergeConflictError merge_conflict = 1;
+ // changes_already_applied is returned if the result after applying the revert is empty.
+ ChangesAlreadyAppliedError changes_already_applied = 2;
+ // custom_hook contains the error message if the pre-receive hook failed.
+ CustomHookError custom_hook = 3;
+ // not_ancestor is returned if the old tip of the target branch is not an ancestor of the new commit.
+ NotAncestorError not_ancestor = 4;
+ }
+}
+
// UserCommitFilesActionHeader contains the details of the action to be performed.
message UserCommitFilesActionHeader {
// ActionType is the type of action to perform.
A merge request may have already been submitted, check that on the merge commit, as usually changes in Gitaly are not breaking, compliance becoming mandatory in the following development cycles.