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

Merge pull request #16180 from Bo98/tap-repair-fix

Browse Source 
tap: fix repair not working in some cases
This commit is contained in:
Bo Anderson 2023-11-05 20:05:26 +00:00 committed by GitHub
commit 2fd99da94c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/tap.rb
View File

@ -427,12 +427,14 @@ class Tap
args = %w[fetch] args = %w[fetch]
args << "--quiet" if quiet args << "--quiet" if quiet
args << "origin" args << "origin"
args << "+refs/heads/*:refs/remotes/origin/*"
safe_system "git", "-C", path, *args safe_system "git", "-C", path, *args
git_repo.set_head_origin_auto git_repo.set_head_origin_auto
new_upstream_head = T.must(git_repo.origin_branch_name) new_upstream_head = T.must(git_repo.origin_branch_name)
return if new_upstream_head == current_upstream_head return if new_upstream_head == current_upstream_head
safe_system "git", "-C", path, "config", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"
git_repo.rename_branch old: current_upstream_head, new: new_upstream_head git_repo.rename_branch old: current_upstream_head, new: new_upstream_head
git_repo.set_upstream_branch local: new_upstream_head, origin: new_upstream_head git_repo.set_upstream_branch local: new_upstream_head, origin: new_upstream_head