diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 13:11:08 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 13:11:08 +0300 |
| commit | fa0967179e7656dbd19915cfaabf0cb4ad3170c8 (patch) | |
| tree | 1d673fc12b662ab69f98837f3664dbb16ae6f8e3 /lib | |
| parent | 5526458b4bd4cbba9216793429036155e7b7ea0c (diff) | |
| parent | 0c325ce8f5bb934033448ccee0ac3e4105d68385 (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 5f014e43c6f..a10bc0dd32b 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -2195,6 +2195,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 |