Merge pull request #17786 from Homebrew/git-submodule-uid
This commit is contained in:
commit
4025df1929
@ -1042,11 +1042,13 @@ class GitDownloadStrategy < VCSDownloadStrategy
|
|||||||
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
|
||||||
|
|
||||||
@ -1060,7 +1062,8 @@ class GitDownloadStrategy < VCSDownloadStrategy
|
|||||||
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)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user