diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-02-23 14:25:14 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-02-26 09:08:17 +0000 |
| commit | e351f67874fb98d1d40bd32dca8d9a44a4fc8582 (patch) | |
| tree | 1974848257aded1276832ee4ba16c329d3c69b45 /lib | |
| parent | bb0fe96f75c6a39e57ac5e9f1895a85f8453e3a5 (diff) | |
| download | gitlab-ce-e351f67874fb98d1d40bd32dca8d9a44a4fc8582.tar.gz | |
Suppress whitespace warnings in squash error messagessuppress-squash-warnings
These are obscuring the real error, which is confusing for everyone.
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 |