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

Merge pull request #17786 from Homebrew/git-submodule-uid

Browse Source
This commit is contained in:
Carlo Cabrera 2024-07-17 19:12:01 +02:00 committed by GitHub
commit 4025df1929
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/download_strategy.rb
View File

@ -1040,13 +1040,15 @@ class GitDownloadStrategy < VCSDownloadStrategy
sig { params(timeout: T.nilable(Time)).void } sig { params(timeout: T.nilable(Time)).void }
def update_submodules(timeout: nil) def update_submodules(timeout: nil)
command! "git", command! "git",
args: ["submodule", "foreach", "--recursive", "git submodule sync"], args: ["submodule", "foreach", "--recursive", "git submodule sync"],
chdir: cached_location, chdir: cached_location,
timeout: Utils::Timer.remaining(timeout) timeout: Utils::Timer.remaining(timeout),
reset_uid: true
command! "git", command! "git",
args: ["submodule", "update", "--init", "--recursive"], args: ["submodule", "update", "--init", "--recursive"],
chdir: cached_location, chdir: cached_location,
timeout: Utils::Timer.remaining(timeout) timeout: Utils::Timer.remaining(timeout),
reset_uid: true
fix_absolute_submodule_gitdir_references! fix_absolute_submodule_gitdir_references!
end end
@ -1059,8 +1061,9 @@ class GitDownloadStrategy < VCSDownloadStrategy
# See https://github.com/Homebrew/homebrew-core/pull/1520 for an example. # See https://github.com/Homebrew/homebrew-core/pull/1520 for an example.
def fix_absolute_submodule_gitdir_references! def fix_absolute_submodule_gitdir_references!
submodule_dirs = command!("git", submodule_dirs = command!("git",
args: ["submodule", "--quiet", "foreach", "--recursive", "pwd"], args: ["submodule", "--quiet", "foreach", "--recursive", "pwd"],
chdir: cached_location).stdout chdir: cached_location,
reset_uid: true).stdout
submodule_dirs.lines.map(&:chomp).each do |submodule_dir| submodule_dirs.lines.map(&:chomp).each do |submodule_dir|
work_dir = Pathname.new(submodule_dir) work_dir = Pathname.new(submodule_dir)