operations_pb.rb in gitaly-15.6.0.pre.rc3

- old
+ new

@@ -36,10 +36,11 @@
     end
     add_message "gitaly.UserDeleteBranchRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :branch_name, :bytes, 2
       optional :user, :message, 3, "gitaly.User"
+      optional :expected_old_oid, :string, 4
     end
     add_message "gitaly.UserDeleteBranchResponse" do
       optional :pre_receive_error, :string, 1
     end
     add_message "gitaly.UserDeleteBranchError" do
@@ -51,10 +52,11 @@
     end
     add_message "gitaly.UserDeleteTagRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :tag_name, :bytes, 2
       optional :user, :message, 3, "gitaly.User"
+      optional :expected_old_oid, :string, 4
     end
     add_message "gitaly.UserDeleteTagResponse" do
       optional :pre_receive_error, :string, 1
     end
     add_message "gitaly.UserCreateTagRequest" do
@@ -83,10 +85,11 @@
       optional :user, :message, 2, "gitaly.User"
       optional :commit_id, :string, 3
       optional :branch, :bytes, 4
       optional :message, :bytes, 5
       optional :timestamp, :message, 7, "google.protobuf.Timestamp"
+      optional :expected_old_oid, :string, 8
       optional :apply, :bool, 6
     end
     add_message "gitaly.UserMergeBranchResponse" do
       optional :commit_id, :string, 1
       optional :branch_update, :message, 3, "gitaly.OperationBranchUpdate"
@@ -121,10 +124,11 @@
     add_message "gitaly.UserFFBranchRequest" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :user, :message, 2, "gitaly.User"
       optional :commit_id, :string, 3
       optional :branch, :bytes, 4
+      optional :expected_old_oid, :string, 5
     end
     add_message "gitaly.UserFFBranchResponse" do
       optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"
       optional :pre_receive_error, :string, 2
     end
@@ -136,10 +140,11 @@
       optional :message, :bytes, 5
       optional :start_branch_name, :bytes, 6
       optional :start_repository, :message, 7, "gitaly.Repository"
       optional :dry_run, :bool, 8
       optional :timestamp, :message, 9, "google.protobuf.Timestamp"
+      optional :expected_old_oid, :string, 10
     end
     add_message "gitaly.UserCherryPickResponse" do
       optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"
       optional :create_tree_error, :string, 2
       optional :commit_error, :string, 3
@@ -167,10 +172,11 @@
       optional :message, :bytes, 5
       optional :start_branch_name, :bytes, 6
       optional :start_repository, :message, 7, "gitaly.Repository"
       optional :dry_run, :bool, 8
       optional :timestamp, :message, 9, "google.protobuf.Timestamp"
+      optional :expected_old_oid, :string, 10
     end
     add_message "gitaly.UserRevertResponse" do
       optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"
       optional :create_tree_error, :string, 2
       optional :commit_error, :string, 3
@@ -214,10 +220,11 @@
       optional :start_branch_name, :bytes, 7
       optional :start_repository, :message, 8, "gitaly.Repository"
       optional :force, :bool, 9
       optional :start_sha, :string, 10
       optional :timestamp, :message, 11, "google.protobuf.Timestamp"
+      optional :expected_old_oid, :string, 12
     end
     add_message "gitaly.UserCommitFilesRequest" do
       oneof :user_commit_files_request_payload do
         optional :header, :message, 1, "gitaly.UserCommitFilesRequestHeader"
         optional :action, :message, 2, "gitaly.UserCommitFilesAction"
@@ -293,10 +300,11 @@
     add_message "gitaly.UserApplyPatchRequest.Header" do
       optional :repository, :message, 1, "gitaly.Repository"
       optional :user, :message, 2, "gitaly.User"
       optional :target_branch, :bytes, 3
       optional :timestamp, :message, 4, "google.protobuf.Timestamp"
+      optional :expected_old_oid, :string, 5
     end
     add_message "gitaly.UserApplyPatchResponse" do
       optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"
     end
     add_message "gitaly.UserUpdateSubmoduleRequest" do
@@ -305,9 +313,10 @@
       optional :commit_sha, :string, 3
       optional :branch, :bytes, 4
       optional :submodule, :bytes, 5
       optional :commit_message, :bytes, 6
       optional :timestamp, :message, 7, "google.protobuf.Timestamp"
+      optional :expected_old_oid, :string, 8
     end
     add_message "gitaly.UserUpdateSubmoduleResponse" do
       optional :branch_update, :message, 1, "gitaly.OperationBranchUpdate"
       optional :pre_receive_error, :string, 2
       optional :commit_error, :string, 4