git 1.19.1 → 3.1.1

data/lib/git/status.rb

@@ -1,6 +1,14 @@
+# frozen_string_literal: true
+
 module Git
+  # The status class gets the status of a git repository
+  #
+  # This identifies which files have been modified, added, or deleted from the
+  # worktree. Untracked files are also identified.
+  #
+  # The Status object is an Enumerable that contains StatusFile objects.
   #
-  # A class for git status
+  # @api public
   #
   class Status
     include Enumerable
@@ -16,7 +24,7 @@ module Git
     #
     # @return [Enumerable]
     def changed
-      @files.select { |_k, f| f.type == 'M' }
+      @_changed ||= @files.select { |_k, f| f.type == 'M' }
     end
 
     #
@@ -28,20 +36,19 @@ module Git
     #     changed?('lib/git.rb')
     # @return [Boolean]
     def changed?(file)
-      changed.member?(file)
+      case_aware_include?(:changed, :lc_changed, file)
     end
 
-    #
     # Returns an Enumerable containing files that have been added.
     # File path starts at git base directory
     #
     # @return [Enumerable]
     def added
-      @files.select { |_k, f| f.type == 'A' }
+      @_added ||= @files.select { |_k, f| f.type == 'A' }
     end
 
-    #
     # Determines whether the given file has been added to the repository
+    #
     # File path starts at git base directory
     #
     # @param file [String] The name of the file.
@@ -49,7 +56,7 @@ module Git
     #     added?('lib/git.rb')
     # @return [Boolean]
     def added?(file)
-      added.member?(file)
+      case_aware_include?(:added, :lc_added, file)
     end
 
     #
@@ -58,7 +65,7 @@ module Git
     #
     # @return [Enumerable]
     def deleted
-      @files.select { |_k, f| f.type == 'D' }
+      @_deleted ||= @files.select { |_k, f| f.type == 'D' }
     end
 
     #
@@ -70,7 +77,7 @@ module Git
     #     deleted?('lib/git.rb')
     # @return [Boolean]
     def deleted?(file)
-      deleted.member?(file)
+      case_aware_include?(:deleted, :lc_deleted, file)
     end
 
     #
@@ -79,7 +86,7 @@ module Git
     #
     # @return [Enumerable]
     def untracked
-      @files.select { |_k, f| f.untracked }
+      @_untracked ||= @files.select { |_k, f| f.untracked }
     end
 
     #
@@ -91,11 +98,11 @@ module Git
     #     untracked?('lib/git.rb')
     # @return [Boolean]
     def untracked?(file)
-      untracked.member?(file)
+      case_aware_include?(:untracked, :lc_untracked, file)
     end
 
     def pretty
-      out = ''
+      out = +''
       each do |file|
         out << pretty_file(file)
       end
@@ -126,9 +133,63 @@ module Git
 
     # subclass that does heavy lifting
     class StatusFile
-      attr_accessor :path, :type, :stage, :untracked
-      attr_accessor :mode_index, :mode_repo
-      attr_accessor :sha_index, :sha_repo
+      # @!attribute [r] path
+      #   The path of the file relative to the project root directory
+      #   @return [String]
+      attr_accessor :path
+
+      # @!attribute [r] type
+      #   The type of change
+      #
+      #   * 'M': modified
+      #   * 'A': added
+      #   * 'D': deleted
+      #   * nil: ???
+      #
+      #   @return [String]
+      attr_accessor :type
+
+      # @!attribute [r] mode_index
+      #   The mode of the file in the index
+      #   @return [String]
+      #   @example 100644
+      #
+      attr_accessor :mode_index
+
+      # @!attribute [r] mode_repo
+      #   The mode of the file in the repo
+      #   @return [String]
+      #   @example 100644
+      #
+      attr_accessor :mode_repo
+
+      # @!attribute [r] sha_index
+      #   The sha of the file in the index
+      #   @return [String]
+      #   @example 123456
+      #
+      attr_accessor :sha_index
+
+      # @!attribute [r] sha_repo
+      #   The sha of the file in the repo
+      #   @return [String]
+      #   @example 123456
+      attr_accessor :sha_repo
+
+      # @!attribute [r] untracked
+      #   Whether the file is untracked
+      #   @return [Boolean]
+      attr_accessor :untracked
+
+      # @!attribute [r] stage
+      #   The stage of the file
+      #
+      #   * '0': the unmerged state
+      #   * '1': the common ancestor (or original) version
+      #   * '2': "our version" from the current branch head
+      #   * '3': "their version" from the other branch head
+      #   @return [String]
+      attr_accessor :stage
 
       def initialize(base, hash)
         @base = base
@@ -158,10 +219,19 @@ module Git
     private
 
     def construct_status
+      # Lists all files in the index and the worktree
+      # git ls-files --stage
+      # { file => { path: file, mode_index: '100644', sha_index: 'dd4fc23', stage: '0' } }
       @files = @base.lib.ls_files
 
+      # Lists files in the worktree that are not in the index
+      # Add untracked files to @files
       fetch_untracked
+
+      # Lists files that are different between the index vs. the worktree
       fetch_modified
+
+      # Lists files that are different between the repo HEAD vs. the worktree
       fetch_added
 
       @files.each do |k, file_hash|
@@ -170,28 +240,68 @@ module Git
     end
 
     def fetch_untracked
-      ignore = @base.lib.ignored_files
-
-      root_dir = @base.dir.path
-      Dir.glob('**/*', File::FNM_DOTMATCH, base: root_dir) do |file|
-        next if @files[file] || File.directory?(File.join(root_dir, file)) ||
-                ignore.include?(file) || file =~ %r{^.git\/.+}
-
+      # git ls-files --others --exclude-standard, chdir: @git_work_dir)
+      # { file => { path: file, untracked: true } }
+      @base.lib.untracked_files.each do |file|
         @files[file] = { path: file, untracked: true }
       end
     end
 
     def fetch_modified
-      # find modified in tree
+      # Files changed between the index vs. the worktree
+      # git diff-files
+      # { file => { path: file, type: 'M', mode_index: '100644', mode_repo: '100644', sha_index: '0000000', :sha_repo: '52c6c4e' } }
       @base.lib.diff_files.each do |path, data|
         @files[path] ? @files[path].merge!(data) : @files[path] = data
       end
     end
 
     def fetch_added
-      # find added but not committed - new files
+      unless @base.lib.empty?
+      # Files changed between the repo HEAD vs. the worktree
+      # git diff-index HEAD
+      # { file => { path: file, type: 'M', mode_index: '100644', mode_repo: '100644', sha_index: '0000000', :sha_repo: '52c6c4e' } }
       @base.lib.diff_index('HEAD').each do |path, data|
-        @files[path] ? @files[path].merge!(data) : @files[path] = data
+          @files[path] ? @files[path].merge!(data) : @files[path] = data
+        end
+      end
+    end
+
+    # It's worth noting that (like git itself) this gem will not behave well if
+    # ignoreCase is set inconsistently with the file-system itself. For details:
+    # https://git-scm.com/docs/git-config#Documentation/git-config.txt-coreignoreCase
+    def ignore_case?
+      return @_ignore_case if defined?(@_ignore_case)
+      @_ignore_case = @base.config('core.ignoreCase') == 'true'
+    rescue Git::FailedError
+      @_ignore_case = false
+    end
+
+    def downcase_keys(hash)
+      hash.map { |k, v| [k.downcase, v] }.to_h
+    end
+
+    def lc_changed
+      @_lc_changed ||= changed.transform_keys(&:downcase)
+    end
+
+    def lc_added
+      @_lc_added ||= added.transform_keys(&:downcase)
+    end
+
+    def lc_deleted
+      @_lc_deleted ||= deleted.transform_keys(&:downcase)
+    end
+
+    def lc_untracked
+      @_lc_untracked ||= untracked.transform_keys(&:downcase)
+    end
+
+    def case_aware_include?(cased_hash, downcased_hash, file)
+      if ignore_case?
+        send(downcased_hash).include?(file.downcase)
+      else
+        send(cased_hash).include?(file)
       end
     end
   end

data/lib/git/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.19.1'
+  VERSION='3.1.1'
 end

data/lib/git/working_directory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   class WorkingDirectory < Git::Path
   end

data/lib/git/worktree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git/path'
 
 module Git

data/lib/git/worktrees.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Git
   # object that holds all the available worktrees
   class Worktrees

data/lib/git.rb

@@ -1,19 +1,23 @@
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+# frozen_string_literal: true
+
+require 'active_support'
+require 'active_support/deprecation'
+
+module Git
+  Deprecation = ActiveSupport::Deprecation.new('3.0', 'Git')
+end
 
 require 'git/author'
 require 'git/base'
 require 'git/branch'
 require 'git/branches'
 require 'git/command_line_result'
+require 'git/command_line'
 require 'git/config'
 require 'git/diff'
 require 'git/encoding_utils'
+require 'git/errors'
 require 'git/escaped_path'
-require 'git/failed_error'
-require 'git/git_execute_error'
 require 'git/index'
 require 'git/lib'
 require 'git/log'
@@ -21,7 +25,6 @@ require 'git/object'
 require 'git/path'
 require 'git/remote'
 require 'git/repository'
-require 'git/signaled_error'
 require 'git/status'
 require 'git/stash'
 require 'git/stashes'
@@ -380,4 +383,15 @@ module Git
   def self.open(working_dir, options = {})
     Base.open(working_dir, options)
   end
+
+  # Return the version of the git binary
+  #
+  # @example
+  #  Git.binary_version # => [2, 46, 0]
+  #
+  # @return [Array<Integer>] the version of the git binary
+  #
+  def self.binary_version(binary_path = Git::Base.config.binary_path)
+    Base.binary_version(binary_path)
+  end
 end

data/package.json

@@ -0,0 +1,10 @@
+{
+  "devDependencies": {
+    "@commitlint/cli": "^19.8.0",
+    "@commitlint/config-conventional": "^19.8.0",
+    "husky": "^9.1.7"
+  },
+  "scripts": {
+    "prepare": "husky"
+  }
+}

data/release-please-config.json

@@ -0,0 +1,36 @@
+{
+  "bootstrap-sha": "31374263eafea4e23352494ef4f6bea3ce62c1b5",
+  "packages": {
+    ".": {
+      "release-type": "ruby",
+      "package-name": "git",
+      "changelog-path": "CHANGELOG.md",
+      "version-file": "lib/git/version.rb",
+      "bump-minor-pre-major": true,
+      "bump-patch-for-minor-pre-major": true,
+      "draft": false,
+      "prerelease": false,
+      "include-component-in-tag": false,
+      "pull-request-title-pattern": "chore: release v${version}",
+      "changelog-sections": [
+        { "type": "feat",     "section": "Features",      "hidden": false },
+        { "type": "fix",      "section": "Bug Fixes",     "hidden": false },
+        { "type": "build",    "section": "Other Changes", "hidden": false },
+        { "type": "chore",    "section": "Other Changes", "hidden": false },
+        { "type": "ci",       "section": "Other Changes", "hidden": false },
+        { "type": "docs",     "section": "Other Changes", "hidden": false },
+        { "type": "perf",     "section": "Other Changes", "hidden": false },
+        { "type": "refactor", "section": "Other Changes", "hidden": false },
+        { "type": "revert",   "section": "Other Changes", "hidden": false },
+        { "type": "style",    "section": "Other Changes", "hidden": false },
+        { "type": "test",     "section": "Other Changes", "hidden": false }
+      ]
+    }
+  },
+  "plugins": [
+    {
+      "type": "sentence-case"
+    }
+  ],
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
+}

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Scott Chacon and others
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -25,117 +38,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: rchardet
+  name: process_executer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: rchardet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
+        version: '1.9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: create_github_release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.2'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -181,35 +194,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/stale.yml"
+- ".commitlintrc.yml"
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".github/workflows/continuous_integration.yml"
+- ".github/workflows/enforce_conventional_commits.yml"
+- ".github/workflows/experimental_continuous_integration.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
+- ".husky/commit-msg"
+- ".release-please-manifest.json"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dockerfile.changelog-rs
 - Gemfile
-- ISSUE_TEMPLATE.md
 - LICENSE
 - MAINTAINERS.md
-- PULL_REQUEST_TEMPLATE.md
 - README.md
-- RELEASING.md
 - Rakefile
 - git.gemspec
 - lib/git.rb
 - lib/git/author.rb
 - lib/git/base.rb
-- lib/git/base/factory.rb
 - lib/git/branch.rb
 - lib/git/branches.rb
+- lib/git/command_line.rb
 - lib/git/command_line_result.rb
 - lib/git/config.rb
 - lib/git/diff.rb
 - lib/git/encoding_utils.rb
+- lib/git/errors.rb
 - lib/git/escaped_path.rb
-- lib/git/failed_error.rb
-- lib/git/git_execute_error.rb
 - lib/git/index.rb
 - lib/git/lib.rb
 - lib/git/log.rb
@@ -217,7 +232,6 @@ files:
 - lib/git/path.rb
 - lib/git/remote.rb
 - lib/git/repository.rb
-- lib/git/signaled_error.rb
 - lib/git/stash.rb
 - lib/git/stashes.rb
 - lib/git/status.rb
@@ -226,15 +240,16 @@ files:
 - lib/git/working_directory.rb
 - lib/git/worktree.rb
 - lib/git/worktrees.rb
+- package.json
+- release-please-config.json
 homepage: http://github.com/ruby-git/ruby-git
 licenses:
 - MIT
 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/1.19.1/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/1.19.1
-post_install_message:
+  changelog_uri: https://rubydoc.info/gems/git/3.1.1/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/3.1.1
 rdoc_options: []
 require_paths:
 - lib
@@ -242,16 +257,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- git 1.6.0.0, or greater
-rubygems_version: 3.5.3
-signing_key:
+- git 2.28.0 or greater
+rubygems_version: 3.6.7
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories
 test_files: []

data/.github/stale.yml

@@ -1,25 +0,0 @@
-# Probot: Stale
-# https://github.com/probot/stale
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-
-# Number of days of inactivity before a stale issue is closed
-# Set to false to disable. If disabled, issues still need to be closed
-# manually, but will remain marked as stale.
-daysUntilClose: false
-
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-
-# Label to use when marking an issue as stale
-staleLabel: stale
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  A friendly reminder that this issue had no activity for 60 days.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false