admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

brew-pull: Add flag to suppress whitespace fixes

Browse Source 
When the pull request includes a patch, fixing whitespace can break the patch.
This commit is contained in:
Charlie Sharpsteen 2011-10-24 18:51:02 -07:00
parent cbdb603838
commit d54e7fb4de
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Contributions/examples/brew-pull.rb
View File

@ -13,7 +13,7 @@ if ARGV.empty?
end end
HOMEBREW_REPOSITORY.cd do HOMEBREW_REPOSITORY.cd do
ARGV.each do|arg| ARGV.named.each do|arg|
if arg.to_i > 0 if arg.to_i > 0
url = 'https://github.com/mxcl/homebrew/pull/' + arg + '.patch' url = 'https://github.com/mxcl/homebrew/pull/' + arg + '.patch'
else else
@ -38,7 +38,11 @@ HOMEBREW_REPOSITORY.cd do
# Makes sense to squash whitespace errors, we don't want them. # Makes sense to squash whitespace errors, we don't want them.
ohai 'Applying patch' ohai 'Applying patch'
safe_system 'git', 'am', '--signoff', '--whitespace=fix', patchpath patch_args = %w[am --signoff]
patch_args << '--whitespace=fix' unless ARGV.include? '--ignore-whitespace'
patch_args << patchpath
safe_system 'git', *patch_args
issue = arg.to_i > 0 ? arg.to_i : urlmatch[2] issue = arg.to_i > 0 ? arg.to_i : urlmatch[2]
if issue if issue