From 6a3dc198f5501d4c98d661fd17fd2231715e8d16 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 22 Oct 2013 23:55:58 +0100 Subject: [PATCH] brew-pull: fix whitespace handling. --- Library/Contributions/cmd/brew-pull.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb index de368f9fb5..a0eb1b4b98 100755 --- a/Library/Contributions/cmd/brew-pull.rb +++ b/Library/Contributions/cmd/brew-pull.rb @@ -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