diff options
| author | Mike McQuaid | 2010-12-02 00:10:03 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2010-12-02 00:10:50 +0000 |
| commit | f44d1f06e533dafb8a49cc6a4f63d9c46a4b1bd7 (patch) | |
| tree | a560bfbac3eeeef15dfca410aebf9e2ac5d874e4 | |
| parent | 1efd33cac090936616e9873ae58ae540d0581517 (diff) | |
| download | brew-f44d1f06e533dafb8a49cc6a4f63d9c46a4b1bd7.tar.bz2 | |
Fix brew pull looking at uncommitted work.
| -rwxr-xr-x | Library/Contributions/examples/brew-pull.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Contributions/examples/brew-pull.rb b/Library/Contributions/examples/brew-pull.rb index 2eccdd0d6..81a50bf76 100755 --- a/Library/Contributions/examples/brew-pull.rb +++ b/Library/Contributions/examples/brew-pull.rb @@ -33,10 +33,10 @@ HOMEBREW_REPOSITORY.cd do safe_system 'git', 'am', '--signoff', '--whitespace=fix', patchpath ohai 'Patch changed:' - safe_system 'git', 'diff', 'HEAD~1', '--stat' + safe_system 'git', 'diff', 'HEAD^..HEAD', '--stat' if install - status, filename = `git diff HEAD~1 --name-status`.split() + status, filename = `git diff HEAD^..HEAD --name-status`.split() # Don't try and do anything to removed files. if (status == 'A' or status == 'M') and filename.include? '/Formula/' formula = File.basename(filename, '.rb') |