brew-pull: fix whitespace handling.
This commit is contained in:
parent
047c8eb927
commit
6a3dc198f5
@ -52,7 +52,11 @@ ARGV.named.each do|arg|
|
|||||||
patch_args << '--signoff' unless ARGV.include? '--clean'
|
patch_args << '--signoff' unless ARGV.include? '--clean'
|
||||||
# Normally we don't want whitespace errors, but squashing them can break
|
# Normally we don't want whitespace errors, but squashing them can break
|
||||||
# patches so an option is provided to skip this step.
|
# 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
|
patch_args << patchpath
|
||||||
|
|
||||||
safe_system 'git', *patch_args
|
safe_system 'git', *patch_args
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user