diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-22 19:50:30 +0300 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-26 08:38:13 +0300 |
| commit | 7ff357207402e0b473a975002f76bdf5795993d2 (patch) | |
| tree | 64beeba976af6394983aa19bdd5d00d327572167 /lib | |
| parent | 8eee00c9d4fe62817bc54333724eec453483c596 (diff) | |
Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'
Encode Gitaly diff patches properly
See merge request !12368
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/diff.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/diff_stitcher.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb index 88ad760bea3..a42f4b8340d 100644 --- a/lib/gitlab/git/diff.rb +++ b/lib/gitlab/git/diff.rb @@ -319,7 +319,7 @@ module Gitlab end def init_from_gitaly(diff) - @diff = diff.patch if diff.respond_to?(:patch) + @diff = encode!(diff.patch) if diff.respond_to?(:patch) @new_path = encode!(diff.to_path.dup) @old_path = encode!(diff.from_path.dup) @a_mode = diff.old_mode.to_s(8) diff --git a/lib/gitlab/gitaly_client/diff_stitcher.rb b/lib/gitlab/gitaly_client/diff_stitcher.rb index d84e8d752dc..65d81dc5d46 100644 --- a/lib/gitlab/gitaly_client/diff_stitcher.rb +++ b/lib/gitlab/gitaly_client/diff_stitcher.rb @@ -13,7 +13,10 @@ module Gitlab @rpc_response.each do |diff_msg| if current_diff.nil? diff_params = diff_msg.to_h.slice(*GitalyClient::Diff::FIELDS) - diff_params[:patch] = diff_msg.raw_patch_data + # gRPC uses frozen strings by default, and we need to have an unfrozen string as it + # gets processed further down the line. So we unfreeze the first chunk of the patch + # in case it's the only chunk we receive for this diff. + diff_params[:patch] = diff_msg.raw_patch_data.dup current_diff = GitalyClient::Diff.new(diff_params) else |