Merge pull request #8076 from rubygems/deivid-rodriguez/fix-git-cache-without-root-git-dir-ancestor

Fix old cache format detection when application is not source controlled

(cherry picked from commit 7597304)

Author: deivid-rodriguez

bundler/lib/bundler/source/git.rb

@@ -191,7 +191,7 @@ def specs(*)
         set_up_app_cache!(app_cache_path) if use_app_cache?
 
         if requires_checkout? && !@copied
-          FileUtils.rm_rf(app_cache_path) if use_app_cache? && git_proxy.not_a_bare_repository?
+          FileUtils.rm_rf(app_cache_path) if use_app_cache? && git_proxy.not_a_repository?
 
           fetch
           checkout

bundler/lib/bundler/source/git/git_proxy.rb

@@ -84,8 +84,10 @@ def current_branch
           end
         end
 
-        def not_a_bare_repository?
-          git_local("rev-parse", "--is-bare-repository", dir: path).strip == "false"
+        def not_a_repository?
+          _, status = git_null("rev-parse", "--resolve-git-dir", path.to_s, dir: path)
+
+          !status.success?
         end
 
         def contains?(commit)

bundler/spec/cache/git_spec.rb

@@ -323,8 +323,6 @@
     FileUtils.mkdir_p bundled_app("vendor/cache")
     FileUtils.cp_r git_path, bundled_app("vendor/cache/foo-1.0-#{path_revision}")
     FileUtils.rm_rf bundled_app("vendor/cache/foo-1.0-#{path_revision}/.git")
-    # bundle install with git repo needs to be run under the git environment.
-    Dir.chdir(bundled_app) { system(*%W[git init --quiet]) }
 
     bundle :install, env: { "BUNDLE_DEPLOYMENT" => "true", "BUNDLE_CACHE_ALL" => "true" }
   end