diff options
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/brew.h.rb | 4 | ||||
| -rwxr-xr-x | Library/Homebrew/unittest.rb | 16 | ||||
| -rw-r--r-- | Library/Homebrew/update.rb | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb index a524c3298..f482559f6 100644 --- a/Library/Homebrew/brew.h.rb +++ b/Library/Homebrew/brew.h.rb @@ -97,8 +97,8 @@ def info name user='' user=`git config --global github.user`.chomp if system "which git > /dev/null" user='mxcl' if user.empty? - # FIXME it would be nice if we didn't assume the default branch is masterbrew - history="http://github.com/#{user}/homebrew/commits/masterbrew/Library/Formula/#{Formula.path(name).basename}" + # FIXME it would be nice if we didn't assume the default branch is master + history="http://github.com/#{user}/homebrew/commits/master/Library/Formula/#{Formula.path(name).basename}" exec 'open', history if ARGV.flag? '--github' diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb index 0a9c497d3..0b2d7df7f 100755 --- a/Library/Homebrew/unittest.rb +++ b/Library/Homebrew/unittest.rb @@ -514,8 +514,8 @@ class BeerTasting <Test::Unit::TestCase def test_updater_update_homebrew_without_any_changes outside_prefix do updater = RefreshBrewMock.new - updater.in_prefix_expect("git checkout masterbrew") - updater.in_prefix_expect("git pull origin masterbrew", "Already up-to-date.\n") + updater.in_prefix_expect("git checkout master") + updater.in_prefix_expect("git pull origin master", "Already up-to-date.\n") assert_equal false, updater.update_from_masterbrew! assert updater.expectations_met? @@ -526,9 +526,9 @@ class BeerTasting <Test::Unit::TestCase def test_updater_update_homebrew_without_formulae_changes outside_prefix do updater = RefreshBrewMock.new - updater.in_prefix_expect("git checkout masterbrew") + updater.in_prefix_expect("git checkout master") output = fixture('update_git_pull_output_without_formulae_changes') - updater.in_prefix_expect("git pull origin masterbrew", output) + updater.in_prefix_expect("git pull origin master", output) assert_equal true, updater.update_from_masterbrew! assert !updater.pending_formulae_changes? @@ -539,9 +539,9 @@ class BeerTasting <Test::Unit::TestCase def test_updater_update_homebrew_with_formulae_changes outside_prefix do updater = RefreshBrewMock.new - updater.in_prefix_expect("git checkout masterbrew") + updater.in_prefix_expect("git checkout master") output = fixture('update_git_pull_output_with_formulae_changes') - updater.in_prefix_expect("git pull origin masterbrew", output) + updater.in_prefix_expect("git pull origin master", output) assert_equal true, updater.update_from_masterbrew! assert updater.pending_formulae_changes? @@ -584,7 +584,7 @@ update_git_pull_output_without_formulae_changes: | remote: Total 39 (delta 20), reused 0 (delta 0) Unpacking objects: 100% (39/39), done. From git://github.com/mxcl/homebrew - * branch masterbrew -> FETCH_HEAD + * branch master -> FETCH_HEAD Updating 14ef7f9..f414bc8 Fast forward Library/Homebrew/ARGV+yeast.rb | 35 ++-- @@ -604,7 +604,7 @@ update_git_pull_output_with_formulae_changes: | remote: Total 39 (delta 20), reused 0 (delta 0) Unpacking objects: 100% (39/39), done. From git://github.com/mxcl/homebrew - * branch masterbrew -> FETCH_HEAD + * branch master -> FETCH_HEAD Updating 14ef7f9..f414bc8 Fast forward Library/Contributions/brew_bash_completion.sh | 6 +- diff --git a/Library/Homebrew/update.rb b/Library/Homebrew/update.rb index 3faa72664..6bbf4b8c0 100644 --- a/Library/Homebrew/update.rb +++ b/Library/Homebrew/update.rb @@ -22,8 +22,8 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # class RefreshBrew - CHECKOUT_COMMAND = 'git checkout masterbrew' - UPDATE_COMMAND = 'git pull origin masterbrew' + CHECKOUT_COMMAND = 'git checkout master' + UPDATE_COMMAND = 'git pull origin master' REVISION_COMMAND = 'git log -l -1 --pretty=format:%H' GIT_UP_TO_DATE = 'Already up-to-date.' UPDATED_FORMULA = %r{^\s+Library/Formula/(.+?)\.rb\s} |