brew-pull: fix whitespace handling.

This commit is contained in:
Mike McQuaid 2013-10-22 23:55:58 +01:00
parent 047c8eb927
commit 6a3dc198f5

View File

@ -52,7 +52,11 @@ ARGV.named.each do|arg|
patch_args << '--signoff' unless ARGV.include? '--clean'
# Normally we don't want whitespace errors, but squashing them can break
# patches so an option is provided to skip this step.
patch_args << '--whitespace=fix' unless ARGV.include? '--ignore-whitespace' or ARGV.include? '--clean'
if ARGV.include? '--ignore-whitespace' or ARGV.include? '--clean'
patch_args << '--whitespace=nowarn'
else
patch_args << '--whitespace=fix'
end
patch_args << patchpath
safe_system 'git', *patch_args