overcommit 0.73.0 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887ad3a2999ba4744c926ad05bc61e453901822b378645d1dfbc10d4be0a0648
-  data.tar.gz: 66d06d2f6216a1e480c3e5ec053ea4fb967b6e8a80a7302d70a0cdd1a05207ef
+  metadata.gz: 429fa7e31530c84fe84b624201dfb77296f31fd34be4e1fb10a354b3dc4ce9ff
+  data.tar.gz: ab2319699f8e677cab7ed3dc24854e12a7b6cfe7a911b9bcab3b8c2a82bead10
 SHA512:
-  metadata.gz: 189138eaa9cf531fa861c87014ec420e9580c1d11f1492243050c542c32a8762e1f5d58ac82bdf18fc7526d257f0bb428192d9f8b6901c2b38a8717f0fd30a8a
-  data.tar.gz: 917260eb13fc2f85e828fbebdbd1f04c30c6acbaeb7e02b594452d35d8974dede978d8e882c41e35348e529e09d94e0ab54aa046087c9bbf80d62437eaf7e798
+  metadata.gz: 3d7967d9579fb937a29a851157f4d74d620fe7e4fc3841b63a33bff84809038a49326a1d148fbe57872b1e90e42558b04027901d0193968626d74e72230ba3f5
+  data.tar.gz: a21c06966bdf3817034b98f4d7f06a0810a522d9234534402fc3ec77abbf26d22278e25fc42741c88d9a693ef27d0fab8c7d029e6a979e596710d7cf1952abd6

data/lib/overcommit/configuration.rb

@@ -214,8 +214,9 @@ module Overcommit
       return false if ENV['OVERCOMMIT_NO_VERIFY']
       return true if @hash['verify_signatures'] != false
 
+      scope = Overcommit::GitConfig.signature_scope
       result = Overcommit::Utils.execute(
-        %W[git config --local --get #{verify_signature_config_key}]
+        %W[git config #{scope} --get #{verify_signature_config_key}]
       )
 
       if result.status == 1 # Key doesn't exist
@@ -232,13 +233,14 @@ module Overcommit
 
     # Update the currently stored signature for this hook.
     def update_signature!
+      scope = Overcommit::GitConfig.signature_scope
       result = Overcommit::Utils.execute(
-        %w[git config --local] + [signature_config_key, signature]
+        %W[git config #{scope}] + [signature_config_key, signature]
       )
 
       verify_signature_value = @hash['verify_signatures'] ? 1 : 0
       result &&= Overcommit::Utils.execute(
-        %W[git config --local #{verify_signature_config_key} #{verify_signature_value}]
+        %W[git config #{scope} #{verify_signature_config_key} #{verify_signature_value}]
       )
 
       unless result.success?
@@ -325,8 +327,9 @@ module Overcommit
     #
     # @return [String]
     def stored_signature
+      scope = Overcommit::GitConfig.signature_scope
       result = Overcommit::Utils.execute(
-        %w[git config --local --get] + [signature_config_key]
+        %W[git config #{scope} --get] + [signature_config_key]
       )
 
       if result.status == 1 # Key doesn't exist

data/lib/overcommit/git_config.rb

@@ -19,5 +19,13 @@ module Overcommit
 
       File.expand_path(path, Dir.pwd)
     end
+
+    # Config file option for storing hook signatures: the per-worktree file
+    # when extensions.worktreeConfig is on, so worktrees with different
+    # configurations do not overwrite each other's signatures.
+    def signature_scope
+      enabled = `git config --bool --get extensions.worktreeConfig`.chomp
+      enabled == 'true' ? '--worktree' : '--local'
+    end
   end
 end

data/lib/overcommit/git_repo.rb

@@ -131,12 +131,14 @@ module Overcommit
       Overcommit::Utils.execute(%W[git ls-files #{path} --error-unmatch]).success?
     end
 
-    # Returns the names of all files that are tracked by git.
+    # Returns the names of all files that are tracked by git, excluding files
+    # that have been deleted from the working tree.
     #
     # @return [Array<String>] list of absolute file paths
     def all_files
-      `git ls-files`.
-        split(/\n/).
+      deleted_files = `git ls-files --deleted`.split(/\n/)
+
+      (`git ls-files`.split(/\n/) - deleted_files).
         map { |relative_file| File.expand_path(relative_file) }.
         reject { |file| File.directory?(file) } # Exclude submodule directories
     end

data/lib/overcommit/hook/commit_msg/text_width.rb

@@ -4,6 +4,11 @@ module Overcommit::Hook::CommitMsg
   # Ensures the number of columns the subject and commit message lines occupy is
   # under the preferred limits.
   class TextWidth < Base
+    # A line consisting only of a URL (optionally as a Markdown-style link
+    # reference such as `[1]: https://...`) cannot be wrapped without breaking
+    # the link, so it is exempt from the body width limit.
+    URL_ONLY_LINE = %r{\A(\[[^\]]+\]:\s*)?[a-z][a-z0-9+.-]*://\S+\z}i.freeze
+
     def run
       return :pass if empty_message?
 
@@ -42,13 +47,17 @@ module Overcommit::Hook::CommitMsg
       max_body_width = config['max_body_width']
 
       lines[2..].each_with_index do |line, index|
-        if line.chomp.size > max_body_width
-          @errors << "Line #{index + 3} of commit message has > " \
-                    "#{max_body_width} characters"
-        end
+        next if line.chomp.size <= max_body_width || url_only_line?(line)
+
+        @errors << "Line #{index + 3} of commit message has > " \
+                  "#{max_body_width} characters"
       end
     end
 
+    def url_only_line?(line)
+      URL_ONLY_LINE.match?(line.strip)
+    end
+
     def special_prefix_length(subject)
       subject.match(/^(fixup|squash)! /) { |match| match[0].length } || 0
     end

data/lib/overcommit/hook_context/helpers/file_modifications.rb

@@ -12,7 +12,9 @@ module Overcommit::HookContext
         cmd = Overcommit::Utils.parent_command
         return unless cmd
 
-        amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
+        # POSIX character class rather than `\s`, which macOS git's regex
+        # library does not support
+        amend_pattern = 'commit([[:space:]].*)?[[:space:]]--amend([[:space:]]|$)'
 
         # Since the ps command can return invalid byte sequences for commands
         # containing unicode characters, we replace the offending characters,

data/lib/overcommit/hook_signer.rb

@@ -68,8 +68,9 @@ module Overcommit
 
     # Update the current stored signature for this hook.
     def update_signature!
+      scope = Overcommit::GitConfig.signature_scope
       result = Overcommit::Utils.execute(
-        %w[git config --local] + [signature_config_key, signature]
+        %W[git config #{scope}] + [signature_config_key, signature]
       )
 
       unless result.success?
@@ -103,8 +104,9 @@ module Overcommit
     end
 
     def stored_signature
+      scope = Overcommit::GitConfig.signature_scope
       result = Overcommit::Utils.execute(
-        %w[git config --local --get] + [signature_config_key]
+        %W[git config #{scope} --get] + [signature_config_key]
       )
 
       if result.status == 1 # Key doesn't exist

data/lib/overcommit/subprocess.rb

@@ -2,7 +2,6 @@
 
 require 'childprocess'
 require 'tempfile'
-require 'overcommit/os'
 
 module Overcommit
   # Manages execution of a child process, collecting the exit status and
@@ -28,8 +27,6 @@ module Overcommit
       # @option options [String] input string to pass via standard input stream
       # @return [Result]
       def spawn(args, options = {})
-        args = win32_prepare_args(args) if OS.windows?
-
         process = ChildProcess.build(*args)
 
         out, err = assign_output_streams(process)
@@ -53,13 +50,16 @@ module Overcommit
         out.rewind
 
         Result.new(process.exit_code, out.read, err.read)
+      ensure
+        # Delete the output files now rather than leaving it to the garbage
+        # collector, which on Windows fails (and prints a backtrace) if a process
+        # left behind by the command still has them open.
+        [out, err].each { |stream| stream&.close! }
       end
 
       # Spawns a new process in the background using the given array of
       # arguments (the first element is the command).
       def spawn_detached(args)
-        args = win32_prepare_args(args) if OS.windows?
-
         process = ChildProcess.build(*args)
         process.detach = true
 
@@ -70,20 +70,6 @@ module Overcommit
 
       private
 
-      # Necessary to run commands in the cmd.exe context.
-      # Args are joined to properly handle quotes and special characters.
-      def win32_prepare_args(args)
-        args = args.map do |arg|
-          # Quote args that contain whitespace
-          arg = "\"#{arg}\"" if arg =~ /\s/
-
-          # Escape cmd.exe metacharacters
-          arg.gsub(/[()%!^"<>&|]/, '^\0')
-        end
-
-        %w[cmd.exe /c] + [args.join(' ')]
-      end
-
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)

data/lib/overcommit/utils/file_utils.rb

@@ -49,13 +49,13 @@ module Overcommit::Utils
 
       def win32_dir_cmd(file_name)
         Overcommit::Subprocess.spawn(
-          %W[dir #{win32_fix_pathsep(file_name)}]
+          %W[cmd.exe /c dir #{win32_fix_pathsep(file_name)}]
         )
       end
 
       def win32_mklink_cmd(old_name, new_name)
         Overcommit::Subprocess.spawn(
-          %W[mklink #{win32_fix_pathsep(new_name)} #{win32_fix_pathsep(old_name)}]
+          %W[cmd.exe /c mklink #{win32_fix_pathsep(new_name)} #{win32_fix_pathsep(old_name)}]
         )
       end
 

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.73.0'
+  VERSION = '0.74.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.73.0
+  version: 0.74.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'