diff options
| author | Jack Nagel | 2012-05-01 18:03:36 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-05-01 18:07:58 -0500 |
| commit | b6002b2e52db65387e41d26ea3b8e25c41385195 (patch) | |
| tree | f1733e4eb97d17749f4f071008b70464a493707d | |
| parent | 1554e57a00caaf2e73393cdf59aa08ba455aaf79 (diff) | |
| download | homebrew-b6002b2e52db65387e41d26ea3b8e25c41385195.tar.bz2 | |
Don't set GIT_DIR when staging git clones
GIT_DIR is convenient, but it does not work when both a formula and
subformula try to stage a git checkout, as git will use the main
formula's repository when staging the subformula.
Stop setting it, and restore the kludge to the git-multipush formula.
Fixes #10893.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/git-multipush.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/download_strategy.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Library/Formula/git-multipush.rb b/Library/Formula/git-multipush.rb index 8ee3aa1c0..7ab88fd74 100644 --- a/Library/Formula/git-multipush.rb +++ b/Library/Formula/git-multipush.rb @@ -11,6 +11,7 @@ class GitMultipush < Formula def install if ARGV.build_head? + ENV['GIT_DIR'] = cached_location/'.git' inreplace 'make/gen-version.mk', '.git', '$(GIT_DIR)' system "make" end diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index cb15e7224..6b8aff900 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -393,7 +393,6 @@ class GitDownloadStrategy < AbstractDownloadStrategy safe_system 'git', 'submodule', '--quiet', 'foreach', '--recursive', sub_cmd end end - ENV['GIT_DIR'] = cached_location+'.git' end end |