diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 13:11:08 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-19 14:14:53 +0300 |
| commit | 27a6d876cb690526713baea49ceea2d6dde75417 (patch) | |
| tree | 512eb9fbd83d04c406861134c8eb99afc875fc58 /lib | |
| parent | 8dc1fae03d5519cf28bedc73b082e187e0d67c90 (diff) | |
Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'
Fix squash rebase not working when diff contained encoded data
Closes gitlab-ee#4960
See merge request gitlab-org/gitlab-ce!17205
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 6761fb0937a..706930a96b7 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -2198,6 +2198,7 @@ module Gitlab # Apply diff of the `diff_range` to the worktree diff = run_git!(%W(diff --binary #{diff_range})) run_git!(%w(apply --index), chdir: squash_path, env: env) do |stdin| + stdin.binmode stdin.write(diff) end |