admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update: allow updating from local branch

Browse Source 
Closes Homebrew/homebrew#44893.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Vlad Shablinsky 2015-10-13 18:40:31 +03:00 committed by Mike McQuaid
parent 667fa65be8
commit e04a463f11
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cmd/update.rb
View File

@ -216,6 +216,20 @@ class Updater
@initial_branch = "" @initial_branch = ""
end end
# Used for testing purposes, e.g., for testing formula migration after
# renaming it in the currently checked-out branch. To test run
# "brew update --simulate-from-current-branch"
if ARGV.include?("--simulate-from-current-branch")
@initial_revision = `git rev-parse -q --verify #{@upstream_branch}`.chomp
@current_revision = read_current_revision
begin
safe_system "git", "merge-base", "--is-ancestor", @initial_revision, @current_revision
rescue ErrorDuringExecution
odie "Your HEAD is not a descendant of '#{@upstream_branch}'."
end
return
end
if @initial_branch != @upstream_branch && !@initial_branch.empty? if @initial_branch != @upstream_branch && !@initial_branch.empty?
safe_system "git", "checkout", @upstream_branch, *quiet safe_system "git", "checkout", @upstream_branch, *quiet
end end