diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-26 15:06:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-26 15:06:36 +0000 |
| commit | 91ab86e59c29f03ab91f58112d5cf7eda608905b (patch) | |
| tree | ac8dc4c6742cccc9b22a93440f52d40471787e6c /lib | |
| parent | 2e59b4ea15f819d3b41140bf15a8e95a4a760cd3 (diff) | |
| parent | e351f67874fb98d1d40bd32dca8d9a44a4fc8582 (diff) | |
| download | gitlab-ce-91ab86e59c29f03ab91f58112d5cf7eda608905b.tar.gz | |
Merge branch 'suppress-squash-warnings' into 'master'
Suppress whitespace warnings in squash error messages
Closes gitlab-ee#3639
See merge request gitlab-org/gitlab-ce!17317
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index e3cbf017e55..ddb9cf433eb 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -2206,7 +2206,7 @@ module Gitlab with_worktree(squash_path, branch, sparse_checkout_files: diff_files, env: env) do # 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| + run_git!(%w(apply --index --whitespace=nowarn), chdir: squash_path, env: env) do |stdin| stdin.binmode stdin.write(diff) end |