git 4.4.1 → 4.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24c04e4ade577716464aaf17cdac3f1e1d7e860e60dcd9ed964eb8f0f503b4b
-  data.tar.gz: 7913679e60e68c2f51d9189c150dbf8310244afd71a38a0a7ff88845e58d2d96
+  metadata.gz: 5edd3d97d763864b53bf259e67da06224fe1af8700e6229402af735395c48694
+  data.tar.gz: 0be5c354b15762008e8b83208aaa900d8bdadc4bf2e9b953526a112caad9b1c7
 SHA512:
-  metadata.gz: 3e768e8f510d5919d7bacae8095da345e8446546e39e0567aaa2b242700fc4a2045bd6328bd8c5bfa0876375380b679f07aaa33992ebf4828b5298999e033201
-  data.tar.gz: a80276c4a8d613aae86a1adfdaa5f39aabfd3f85e9b4f3dc703612a4fea7afc452f37b9b5d4f3a6d632a2a1e8d12427a5f6f35697ed8daa16e8b2aaebfca5d29
+  metadata.gz: ba7c8e11c635383c3b502eeebe74f6bd8a38baf84c55375c623f24b90376c7a7012119770dfc32e87427970e9d613f25cb80ddeda4d315dd5058b64e37b284c4
+  data.tar.gz: 9fed231ffd42c844f736e19c286a968005050cbf84f2c64a2d3d68fa75982728534590c0ae482d9044b814ed9a631d95f458d82a65edc37ab2f36c2ba9532399

data/.gitignore

@@ -12,3 +12,4 @@ node_modules
 package-lock.json
 ai-prompt.erb
 rubocop-report.json
+git-versions/

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "4.4.1"
+  ".": "4.4.3"
 }

data/CHANGELOG.md

@@ -5,6 +5,24 @@
 
 # Change Log
 
+## [4.4.3](https://github.com/ruby-git/ruby-git/compare/v4.4.2...v4.4.3) (2026-08-30)
+
+
+### Other Changes
+
+* **deps:** Update process_executer to ~> 4.1 ([6f41964](https://github.com/ruby-git/ruby-git/commit/6f41964e400c7fa5a79ef9ec848144aaf56e8d06))
+* Fix rubocop offenses on the 4.x branch ([0361cf5](https://github.com/ruby-git/ruby-git/commit/0361cf521895fb722cd3e1fdb42006ce6d0a6d3c))
+* Ignore the git-versions directory ([2cc1bf5](https://github.com/ruby-git/ruby-git/commit/2cc1bf5f2cca6854d647634d2fef58e681fd90e3))
+* Name maintainer and contributors in the LICENSE copyright notice ([9d0ac3c](https://github.com/ruby-git/ruby-git/commit/9d0ac3ca56c49e1d78deb6e869aaddcb30362cb6))
+* Skip the rubocop rake task on JRuby and TruffleRuby ([da527c2](https://github.com/ruby-git/ruby-git/commit/da527c2314d5a81441b2590609cdadce9d394e17))
+
+## [4.4.2](https://github.com/ruby-git/ruby-git/compare/v4.4.1...v4.4.2) (2026-08-19)
+
+
+### Bug Fixes
+
+* Run the Git.open bootstrap commands without redirecting stdin ([65de0fe](https://github.com/ruby-git/ruby-git/commit/65de0fe88bca34ad3de366ee9a212653de37fc6d)), closes [#840](https://github.com/ruby-git/ruby-git/issues/840)
+
 ## [4.4.1](https://github.com/ruby-git/ruby-git/compare/v4.4.0...v4.4.1) (2026-08-09)
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008 Scott Chacon
+Copyright (c) 2008 Scott Chacon, 2020 James Couball, and the ruby-git contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/git.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 5.0'
   spec.add_dependency 'addressable', '~> 2.8'
-  spec.add_dependency 'process_executer', '~> 4.0'
+  spec.add_dependency 'process_executer', '~> 4.1'
   spec.add_dependency 'rchardet', '~> 1.9'
 
   spec.add_development_dependency 'create_github_release', '~> 2.1'

data/lib/git/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'logger'
-require 'open3'
 
 module Git
   # The main public interface for interacting with Git commands
@@ -41,21 +40,14 @@ module Git
     end
 
     def self.binary_version(binary_path)
-      result, status = execute_git_version(binary_path)
-
-      raise "Failed to get git version: #{status}\n#{result}" unless status.success?
-
-      parse_version_string(result)
+      parse_version_string(execute_git_version(binary_path))
     end
 
     private_class_method def self.execute_git_version(binary_path)
-      Open3.capture2e(
-        binary_path,
-        '-c', 'core.quotePath=true',
-        '-c', 'color.ui=false',
-        'version'
-      )
-    rescue Errno::ENOENT
+      bootstrap_command_line(binary_path).run('version', merge: true).stdout
+    rescue Git::CommandLineError => e
+      raise "Failed to get git version: #{e.result.status}\n#{e.result.stdout}"
+    rescue Errno::ENOENT, ProcessExecuter::SpawnError
       raise "Failed to get git version: #{binary_path} not found"
     end
 
@@ -98,26 +90,45 @@ module Git
     def self.root_of_worktree(working_dir)
       raise ArgumentError, "'#{working_dir}' does not exist" unless Dir.exist?(working_dir)
 
-      result, status = execute_rev_parse_toplevel(working_dir)
-      process_rev_parse_result(result, status, working_dir)
+      execute_rev_parse_toplevel(working_dir)
     end
 
     private_class_method def self.execute_rev_parse_toplevel(working_dir)
-      Open3.capture2e(
-        Git::Base.config.binary_path,
-        '-c', 'core.quotePath=true',
-        '-c', 'color.ui=false',
-        'rev-parse', '--show-toplevel',
-        chdir: File.expand_path(working_dir)
-      )
-    rescue Errno::ENOENT
+      bootstrap_command_line(Git::Base.config.binary_path).run(
+        'rev-parse', '--show-toplevel', chdir: File.expand_path(working_dir), merge: true, chomp: true
+      ).stdout
+    rescue Git::CommandLineError
+      raise ArgumentError, "'#{working_dir}' is not in a git working tree"
+    rescue Errno::ENOENT, ProcessExecuter::SpawnError
       raise ArgumentError, 'Failed to find the root of the worktree: git binary not found'
     end
 
-    private_class_method def self.process_rev_parse_result(result, status, working_dir)
-      raise ArgumentError, "'#{working_dir}' is not in a git working tree" unless status.success?
-
-      result.chomp
+    # A command line for the git commands that run before a repository is known
+    #
+    # `Open3` is deliberately not used here. Windows has no fork, so
+    # `Process.spawn` implements a redirect of the child's stdin by redirecting
+    # the *parent's* stdin and restoring it afterward, which replaces the
+    # process's stdin handle. That leaves a console REPL such as irb or pry
+    # unable to read input for the rest of the session. `Git::CommandLine`
+    # redirects only stdout and stderr, so stdin is never disturbed.
+    #
+    # @see https://github.com/ruby-git/ruby-git/issues/840 issue 840
+    #
+    # @param binary_path [String] the path to the git binary to run
+    #
+    # @return [Git::CommandLine] a command line that runs `binary_path` with
+    #   `-c core.quotePath=true -c color.ui=false`
+    #
+    #   Those are the options the `Open3` calls this replaced passed, kept as they were
+    #   so these two commands behave exactly as before. Neither `git version` nor
+    #   `git rev-parse --show-toplevel` emits colored output, so the remaining `color.*`
+    #   settings in {Git::Lib}'s `STATIC_GLOBAL_OPTS` are not needed here.
+    #
+    # @api private
+    #
+    private_class_method def self.bootstrap_command_line(binary_path)
+      Git::CommandLine.new({}, binary_path, ['-c', 'core.quotePath=true', '-c', 'color.ui=false'],
+                           Logger.new(nil))
     end
 
     # (see Git.open)
@@ -295,6 +306,7 @@ module Git
       branch_names.include?(branch)
     end
 
+    # @deprecated Use {#local_branch?} instead
     def is_local_branch?(branch) # rubocop:disable Naming/PredicatePrefix
       Git::Deprecation.warn(
         'Git::Base#is_local_branch? is deprecated and will be removed in a future version. ' \
@@ -309,6 +321,7 @@ module Git
       branch_names.include?(branch)
     end
 
+    # @deprecated Use {#remote_branch?} instead
     def is_remote_branch?(branch) # rubocop:disable Naming/PredicatePrefix
       Git::Deprecation.warn(
         'Git::Base#is_remote_branch? is deprecated and will be removed in a future version. ' \
@@ -323,6 +336,7 @@ module Git
       branch_names.include?(branch)
     end
 
+    # @deprecated Use {#branch?} instead
     def is_branch?(branch) # rubocop:disable Naming/PredicatePrefix
       Git::Deprecation.warn(
         'Git::Base#is_branch? is deprecated and will be removed in a future version. ' \
@@ -699,11 +713,9 @@ module Git
     #   @example Check specific objects
     #     result = git.fsck('abc1234', 'def5678')
     #
-    # rubocop:disable Style/ArgumentsForwarding
-    def fsck(*objects, **opts)
-      lib.fsck(*objects, **opts)
+    def fsck(*objects, **opts) # rubocop:disable Style/ArgumentsForwarding
+      lib.fsck(*objects, **opts) # rubocop:disable Style/ArgumentsForwarding
     end
-    # rubocop:enable Style/ArgumentsForwarding
 
     def apply(file)
       return unless File.exist?(file)

data/lib/git/lib.rb

@@ -11,7 +11,6 @@ require 'process_executer'
 require 'stringio'
 require 'tempfile'
 require 'zlib'
-require 'open3'
 
 module Git
   # Internal git operations
@@ -799,7 +798,7 @@ module Git
     end
 
     def branch_contains(commit, branch_name = '')
-      command('branch',  branch_name, '--contains', commit)
+      command('branch', branch_name, '--contains', commit)
     end
 
     GREP_OPTION_MAP = [

data/lib/git/version.rb

@@ -3,5 +3,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION = '4.4.1'
+  VERSION = '4.4.3'
 end

data/tasks/rubocop.rake

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
-require 'rubocop/rake_task'
+# RuboCop analyzes source text, so its verdict is fixed by TargetRubyVersion in
+# .rubocop.yml, not by the host Ruby. Skipping it on JRuby and TruffleRuby loses no
+# coverage (the MRI matrix jobs lint the same files) and avoids RuboCop internal
+# cop errors on TruffleRuby.
+#
+unless RUBY_PLATFORM == 'java' || RUBY_ENGINE == 'truffleruby'
+  require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new
+  RuboCop::RakeTask.new
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.3
 platform: ruby
 authors:
 - Scott Chacon and others
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
@@ -310,8 +310,8 @@ licenses:
 metadata:
   homepage_uri: http://github.com/ruby-git/ruby-git
   source_code_uri: http://github.com/ruby-git/ruby-git
-  changelog_uri: https://rubydoc.info/gems/git/4.4.1/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/4.4.1
+  changelog_uri: https://rubydoc.info/gems/git/4.4.3/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/4.4.3
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: