diff options
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/pull.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/pull.rb b/Library/Homebrew/cmd/pull.rb index e73ead192..eefda3136 100644 --- a/Library/Homebrew/cmd/pull.rb +++ b/Library/Homebrew/cmd/pull.rb @@ -310,8 +310,15 @@ module Homebrew patch_args << "-p2" if ARGV.include?("--legacy") patch_args << patchpath + start_revision = `git rev-parse HEAD`.strip + begin safe_system "git", "am", *patch_args + if ARGV.include?("--legacy") + safe_system "git", "filter-branch", "-f", "--msg-filter", + "sed -E -e \"s/ (#[0-9]+)/ Homebrew\\/homebrew\\1/g\"", + "#{start_revision}..HEAD" + end rescue ErrorDuringExecution if ARGV.include? "--resolve" odie "Patch failed to apply: try to resolve it." |