diff options
| author | Charlie Sharpsteen | 2011-10-24 19:07:59 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-10-24 19:07:59 -0700 |
| commit | 2ea593c64cbeff01c6bdd584ef936d0029fb2cf7 (patch) | |
| tree | 1557e44684f5a2cce68b67b13afc6afdb71bce4c | |
| parent | 3611188390af3c829d44e819981082a5089d8cfa (diff) | |
| download | homebrew-2ea593c64cbeff01c6bdd584ef936d0029fb2cf7.tar.bz2 | |
brew-pull: Clarify comment concerning whitespace
| -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 |