git 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf601afe6ddef5cc504f0a350bd9595feb76cc95822bd65716d6b5cecf2d324d
-  data.tar.gz: 5f334a391220774ab0fea9c789a87fe3a45d9de55e0745d87f59c0bc9a52e5a9
+  metadata.gz: b171ab737c87e925d5752b52f2f05bdd2361592624d88b8db8db380dde051019
+  data.tar.gz: d7b3b7cdaba4996288c4c0e8fffe7819da6c0933ade68ca810d9fb3519d5cda0
 SHA512:
-  metadata.gz: 20133b00f0f50ccc00dc1bd4bb88107911ff5f438e127b804270752c43029e2447b15a5212c701a24a49a6f98d7b12359cb3326924ea3dadf631408b316e626e
-  data.tar.gz: 11ca7ae94de18e0b3d4aad99d315c2b973a8e2521ee24a935e5236fdc91eace943074ad388889a09ef4d8e33e2a4b1355d2590fe16fe0a1eda05357e1a315290
+  metadata.gz: '08dd5a4ea7b07230642e2dd87fca85ea634890f4700b77a996b3ff4443fc62d3c11a230c082c4d5b2c45c6c7d6916d9b98ce7362676e72d1a4bdd6f0fe2043e6'
+  data.tar.gz: 568111f5579b6b1728974dbfa12dc4d742f3715e951645dbed9a54d91399492157b77659b2e956ee995c142c8dbb01f3ee07357fb4db2a9c2bd0e1870e83dc79

data/CHANGELOG.md

@@ -5,6 +5,20 @@
 
 # Change Log
 
+## v2.1.1 (2024-06-01)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.1.0..v2.1.1)
+
+Changes since v2.1.0:
+
+* 6ce3d4d Handle ignored files with quoted (non-ASCII) filenames
+* dd8e8d4 Supply all of the _specific_ color options too
+* 749a72d Memoize all of the significant calls in Git::Status
+* 2bacccc When core.ignoreCase, check for untracked files case-insensitively
+* 7758ee4 When core.ignoreCase, check for deleted files case-insensitively
+* 993eb78 When core.ignoreCase, check for added files case-insensitively
+* d943bf4 When core.ignoreCase, check for changed files case-insensitively
+
 ## v2.1.0 (2024-05-31)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.0.1..v2.1.0)

data/lib/git/base.rb

@@ -309,6 +309,13 @@ module Git
       self.object('HEAD').grep(string, path_limiter, opts)
     end
 
+    # List the files in the worktree that are ignored by git
+    # @return [Array<String>] the list of ignored files relative to teh root of the worktree
+    #
+    def ignored_files
+      self.lib.ignored_files
+    end
+
     # removes file(s) from the git repository
     def rm(path = '.', opts = {})
       self.lib.rm(path, opts)

data/lib/git/escaped_path.rb

@@ -3,7 +3,7 @@
 module Git
   # Represents an escaped Git path string
   #
-  # Git commands that output paths (e.g. ls-files, diff), will escape usual
+  # Git commands that output paths (e.g. ls-files, diff), will escape unusual
   # characters in the path with backslashes in the same way C escapes control
   # characters (e.g. \t for TAB, \n for LF, \\ for backslash) or bytes with values
   # larger than 0x80 (e.g. octal \302\265 for "micro" in UTF-8).

data/lib/git/lib.rb

@@ -574,18 +574,52 @@ module Git
       diff_as_hash('diff-index', treeish)
     end
 
+    # List all files that are in the index
+    #
+    # @param location [String] the location to list the files from
+    #
+    # @return [Hash<String, Hash>] a hash of files in the index
+    #   * key: file [String] the file path
+    #   * value: file_info [Hash] the file information containing the following keys:
+    #     * :path [String] the file path
+    #     * :mode_index [String] the file mode
+    #     * :sha_index [String] the file sha
+    #     * :stage [String] the file stage
+    #
     def ls_files(location=nil)
       location ||= '.'
-      hsh = {}
-      command_lines('ls-files', '--stage', location).each do |line|
-        (info, file) = line.split("\t")
-        (mode, sha, stage) = info.split
-        if file.start_with?('"') && file.end_with?('"')
-          file = Git::EscapedPath.new(file[1..-2]).unescape
+      {}.tap do |files|
+        command_lines('ls-files', '--stage', location).each do |line|
+          (info, file) = line.split("\t")
+          (mode, sha, stage) = info.split
+          files[unescape_quoted_path(file)] = {
+            :path => file, :mode_index => mode, :sha_index => sha, :stage => stage
+          }
         end
-        hsh[file] = {:path => file, :mode_index => mode, :sha_index => sha, :stage => stage}
       end
-      hsh
+    end
+
+    # Unescape a path if it is quoted
+    #
+    # Git commands that output paths (e.g. ls-files, diff), will escape unusual
+    # characters.
+    #
+    # @example
+    #   lib.unescape_if_quoted('"quoted_file_\\342\\230\\240"') # => 'quoted_file_☠'
+    #   lib.unescape_if_quoted('unquoted_file')   # => 'unquoted_file'
+    #
+    # @param path [String] the path to unescape if quoted
+    #
+    # @return [String] the unescaped path if quoted otherwise the original path
+    #
+    # @api private
+    #
+    def unescape_quoted_path(path)
+      if path.start_with?('"') && path.end_with?('"')
+        Git::EscapedPath.new(path[1..-2]).unescape
+      else
+        path
+      end
     end
 
     def ls_remote(location=nil, opts={})
@@ -606,7 +640,7 @@ module Git
     end
 
     def ignored_files
-      command_lines('ls-files', '--others', '-i', '--exclude-standard')
+      command_lines('ls-files', '--others', '-i', '--exclude-standard').map { |f| unescape_quoted_path(f) }
     end
 
     def untracked_files
@@ -1223,6 +1257,14 @@ module Git
         global_opts << "--work-tree=#{@git_work_dir}" if !@git_work_dir.nil?
         global_opts << '-c' << 'core.quotePath=true'
         global_opts << '-c' << 'color.ui=false'
+        global_opts << '-c' << 'color.advice=false'
+        global_opts << '-c' << 'color.diff=false'
+        global_opts << '-c' << 'color.grep=false'
+        global_opts << '-c' << 'color.push=false'
+        global_opts << '-c' << 'color.remote=false'
+        global_opts << '-c' << 'color.showBranch=false'
+        global_opts << '-c' << 'color.status=false'
+        global_opts << '-c' << 'color.transport=false'
       end
     end
 

data/lib/git/status.rb

@@ -22,7 +22,7 @@ module Git
     #
     # @return [Enumerable]
     def changed
-      @files.select { |_k, f| f.type == 'M' }
+      @_changed ||= @files.select { |_k, f| f.type == 'M' }
     end
 
     #
@@ -34,7 +34,7 @@ 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.
@@ -42,7 +42,7 @@ module Git
     #
     # @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
@@ -54,7 +54,7 @@ module Git
     #     added?('lib/git.rb')
     # @return [Boolean]
     def added?(file)
-      added.member?(file)
+      case_aware_include?(:added, :lc_added, file)
     end
 
     #
@@ -63,7 +63,7 @@ module Git
     #
     # @return [Enumerable]
     def deleted
-      @files.select { |_k, f| f.type == 'D' }
+      @_deleted ||= @files.select { |_k, f| f.type == 'D' }
     end
 
     #
@@ -75,7 +75,7 @@ module Git
     #     deleted?('lib/git.rb')
     # @return [Boolean]
     def deleted?(file)
-      deleted.member?(file)
+      case_aware_include?(:deleted, :lc_deleted, file)
     end
 
     #
@@ -84,7 +84,7 @@ module Git
     #
     # @return [Enumerable]
     def untracked
-      @files.select { |_k, f| f.untracked }
+      @_untracked ||= @files.select { |_k, f| f.untracked }
     end
 
     #
@@ -96,7 +96,7 @@ module Git
     #     untracked?('lib/git.rb')
     # @return [Boolean]
     def untracked?(file)
-      untracked.member?(file)
+      case_aware_include?(:untracked, :lc_untracked, file)
     end
 
     def pretty
@@ -264,5 +264,43 @@ module Git
         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
 end

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='2.1.0'
+  VERSION='2.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,8 +243,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/2.1.0/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/2.1.0
+  changelog_uri: https://rubydoc.info/gems/git/2.1.1/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/2.1.1
 post_install_message:
 rdoc_options: []
 require_paths: