diff options
| author | Charlie Sharpsteen | 2011-10-24 19:07:59 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-10-24 19:07:59 -0700 |
| commit | a6877c02b02d9479794606bda26778cf4551e536 (patch) | |
| tree | f4a4098d02fa4a0d4f140816622d852645a89f99 /Library | |
| parent | d54e7fb4deb98b5572fcdf9a55eba702a2a10f52 (diff) | |
| download | brew-a6877c02b02d9479794606bda26778cf4551e536.tar.bz2 | |
brew-pull: Clarify comment concerning whitespace
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/Contributions/examples/brew-pull.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Contributions/examples/brew-pull.rb b/Library/Contributions/examples/brew-pull.rb index 3ff655b99..980fd1864 100755 --- a/Library/Contributions/examples/brew-pull.rb +++ b/Library/Contributions/examples/brew-pull.rb @@ -36,9 +36,10 @@ HOMEBREW_REPOSITORY.cd do # Store current revision revision = `git log -n1 --format=%H`.strip() - # Makes sense to squash whitespace errors, we don't want them. ohai 'Applying patch' patch_args = %w[am --signoff] + # 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' patch_args << patchpath |