Merge pull request #9038 from ruby/remove-bundler-4-mode

Remove `bundler_4_mode`

Author: hsbt

bundler/lib/bundler/cli.rb

@@ -492,7 +492,7 @@ def version
         build_info = " (#{BuildMetadata.timestamp} commit #{BuildMetadata.git_commit_sha})"
       end
 
-      if !cli_help && Bundler.feature_flag.bundler_4_mode?
+      if !cli_help
         Bundler.ui.info "#{Bundler.verbose_version}#{build_info}"
       else
         Bundler.ui.info "Bundler version #{Bundler.verbose_version}#{build_info}"

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

@@ -408,11 +408,7 @@ def capture(cmd, dir, ignore_err: false)
         def capture3_args_for(cmd, dir)
           return ["git", *cmd] unless dir
 
-          if Bundler.feature_flag.bundler_4_mode? || supports_minus_c?
-            ["git", "-C", dir.to_s, *cmd]
-          else
-            ["git", *cmd, { chdir: dir.to_s }]
-          end
+          ["git", "-C", dir.to_s, *cmd]
         end
 
         def extra_clone_args
@@ -451,10 +447,6 @@ def full_clone?
           depth.nil?
         end
 
-        def supports_minus_c?
-          @supports_minus_c ||= Gem::Version.new(version) >= Gem::Version.new("1.8.5")
-        end
-
         def needs_allow_any_sha1_in_want?
           @needs_allow_any_sha1_in_want ||= Gem::Version.new(version) <= Gem::Version.new("2.13.7")
         end