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

tap: apply suggestions from code review

Browse Source 
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Xuehai Pan 2021-10-12 20:21:58 +08:00 committed by XuehaiPan
parent 828d3505cd
commit 3dcfc7e26e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/tap.rb
View File

@ -366,7 +366,7 @@ class Tap
end end
def fix_remote_configuration(requested_remote: nil, quiet: false) def fix_remote_configuration(requested_remote: nil, quiet: false)
unless requested_remote.nil? if requested_remote.present?
path.cd do path.cd do
safe_system "git", "remote", "set-url", "origin", requested_remote safe_system "git", "remote", "set-url", "origin", requested_remote
safe_system "git", "config", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*" safe_system "git", "config", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"
@ -375,10 +375,10 @@ class Tap
end end
current_upstream_head = path.git_origin_branch current_upstream_head = path.git_origin_branch
return if requested_remote.nil? && path.git_origin_has_branch?(current_upstream_head) return if requested_remote.blank? && path.git_origin_has_branch?(current_upstream_head)
args = %w[fetch] args = %w[fetch]
args << "-q" if quiet args << "--quiet" if quiet
args << "origin" args << "origin"
safe_system "git", "-C", path, *args safe_system "git", "-C", path, *args
path.git_origin_set_head_auto path.git_origin_set_head_auto