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

Revert "download_strategy: escape spaces in git submodule path."

Browse Source 
This is causing submodules to be checked out into a path with a literal
"$path" component:

$ find . | grep "\$path$"
./$path
./Carthage/Checkouts/Commandant/$path
./Carthage/Checkouts/Commandant/Carthage/Checkouts/Quick/$path
./Carthage/Checkouts/PrettyColors/$path
./Carthage/Checkouts/Quick/$path
./Carthage/Checkouts/ReactiveCocoa/$path
./Carthage/Checkouts/ReactiveCocoa/Carthage/Checkouts/Quick/$path
./Carthage/Checkouts/ReactiveTask/$path
./Carthage/Checkouts/ReactiveTask/Carthage/Checkouts/Quick/$path
./Carthage/Checkouts/ReactiveTask/Carthage/Checkouts/ReactiveCocoa/$path
./Carthage/Checkouts/ReactiveTask/Carthage/Checkouts/ReactiveCocoa/Carthage.checkout/Quick/$path

This reverts commit 3a5f099297e9ab3b799af5f7a65edd8d64bc7bae.
This commit is contained in:
Jack Nagel 2015-02-08 19:44:39 -05:00
parent e547438ff4
commit 5c758f7852
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/download_strategy.rb
View File

@ -652,7 +652,7 @@ class GitDownloadStrategy < VCSDownloadStrategy
def checkout_submodules(dst) def checkout_submodules(dst)
escaped_clone_path = cached_location.to_s.gsub(/\//, '\/') escaped_clone_path = cached_location.to_s.gsub(/\//, '\/')
sub_cmd = "git checkout-index -a -f --prefix=#{dst}/${toplevel/#{escaped_clone_path}/}/\'$path\'/" sub_cmd = "git checkout-index -a -f --prefix=#{dst}/${toplevel/#{escaped_clone_path}/}/$path/"
quiet_safe_system "git", "submodule", "foreach", "--recursive", sub_cmd quiet_safe_system "git", "submodule", "foreach", "--recursive", sub_cmd
end end
end end