From 2ea593c64cbeff01c6bdd584ef936d0029fb2cf7 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Mon, 24 Oct 2011 19:07:59 -0700 Subject: brew-pull: Clarify comment concerning whitespace --- Library/Contributions/examples/brew-pull.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Library') 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 -- cgit v1.2.3