From 5c758f7852d2305c3c74ffbb7aae83b22c0fefa6 Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Sun, 8 Feb 2015 19:44:39 -0500
Subject: [PATCH] Revert "download_strategy: escape spaces in git submodule
path."
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.
---
Library/Homebrew/download_strategy.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index c2af946914..9b37594130 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -652,7 +652,7 @@ class GitDownloadStrategy < VCSDownloadStrategy
def checkout_submodules(dst)
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
end
end
--
GitLab