Commit 11433d3e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'file-actions-infer-content' into 'master'

Allow file moves operations to not specify the content

See merge request gitlab-org/gitaly-proto!243
parents c0a8cf6e 31259a2c
This diff is collapsed.
......@@ -175,6 +175,10 @@ message UserCommitFilesActionHeader {
bytes previous_path = 3;
bool base64_content = 4;
bool execute_filemode = 5;
// Move actions that change the file path, but not its content, should set
// infer_content to true instead of populating the content field. Ignored for
// other action types.
bool infer_content = 6;
}
message UserCommitFilesAction {
......
......@@ -117,6 +117,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
optional :previous_path, :bytes, 3
optional :base64_content, :bool, 4
optional :execute_filemode, :bool, 5
optional :infer_content, :bool, 6
end
add_enum "gitaly.UserCommitFilesActionHeader.ActionType" do
value :CREATE, 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment