overcommit 0.71.0 → 0.72.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5826d552313c4de8f5ee1f3f322e16d9193be5be215f4a1203deebd67e8b9333
-  data.tar.gz: 1e013ca830726957ede05edefbeef7e2133851ea039bf819bdd0a22e506b94cb
+  metadata.gz: 05ab1b76d85aa96c6aac3359e74970e7dc186f2ca6ad72ef63c9cef40a0565da
+  data.tar.gz: 863bcdc512b59ddd25c6a03bf6b1f04a6337b00d74607476d0fa6cc1e09090f0
 SHA512:
-  metadata.gz: 7ba0463239dcab4fc78aa972f17d374e205e261ad86bf4eebcbdf4e7bc08af0b8b3b1b601276e25d98f9b22c2cf2835e87ca007cfad50dbe54bbdf996f311a56
-  data.tar.gz: 3c5338c547754f27157ee427ac1c25eed520b036e91e8f901ea31919b5278a9dc99909d10268f8da54e27a1fcdb76fca8c7f1b10e419b0512a2b9eba5ea976e6
+  metadata.gz: 2f5f4eb08a01da2c757bf7c2b1d1add5416aa9b8d7f79e3ac897986d1711b8ee2d0669d1b73cd644eb4d484b468c88cb7e21a0f3973d0535c347b3a1df4728f0
+  data.tar.gz: 7f17b6ae21fd95a05c31715c3d9d055f4ee6059f6a027ad144e1f4e128d6179fdc40c35666821287081be839c32be35109804065aa1e1074059690a38a029113

data/lib/overcommit/git_repo.rb

@@ -160,7 +160,10 @@ module Overcommit
         @merge_head = merge_head
       end
 
-      merge_msg_file = File.expand_path('MERGE_MSG', Overcommit::Utils.git_dir)
+      merge_mode_file = Overcommit::Utils.git_path('MERGE_MODE')
+      @merge_mode = File.open(merge_mode_file).read if File.exist?(merge_mode_file)
+
+      merge_msg_file = Overcommit::Utils.git_path('MERGE_MSG')
       @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
     end
 
@@ -182,17 +185,22 @@ module Overcommit
     # of a merge.
     def restore_merge_state
       if @merge_head
-        FileUtils.touch(File.expand_path('MERGE_MODE', Overcommit::Utils.git_dir))
+        if @merge_mode
+          File.open(Overcommit::Utils.git_path('MERGE_MODE'), 'w') do |f|
+            f.write(@merge_mode)
+          end
+          @merge_mode = nil
+        end
 
-        File.open(File.expand_path('MERGE_HEAD', Overcommit::Utils.git_dir), 'w') do |f|
+        File.open(Overcommit::Utils.git_path('MERGE_HEAD'), 'w') do |f|
           f.write(@merge_head)
         end
         @merge_head = nil
       end
 
       if @merge_msg
-        File.open(File.expand_path('MERGE_MSG', Overcommit::Utils.git_dir), 'w') do |f|
-          f.write("#{@merge_msg}\n")
+        File.open(Overcommit::Utils.git_path('MERGE_MSG'), 'w') do |f|
+          f.write(@merge_msg)
         end
         @merge_msg = nil
       end
@@ -202,8 +210,7 @@ module Overcommit
     # of a cherry-pick.
     def restore_cherry_pick_state
       if @cherry_head
-        File.open(File.expand_path('CHERRY_PICK_HEAD',
-                                   Overcommit::Utils.git_dir), 'w') do |f|
+        File.open(Overcommit::Utils.git_path('CHERRY_PICK_HEAD'), 'w') do |f|
           f.write(@cherry_head)
         end
         @cherry_head = nil

data/lib/overcommit/hook/pre_commit/flay.rb

@@ -24,6 +24,14 @@ module Overcommit::Hook::PreCommit
       # Run the command for each file
       applicable_files.each do |file|
         result = execute(command, args: [file])
+        # flay exits non-zero both when it finds duplication (with output on
+        # stdout) and when it crashes internally. A crash leaves stdout empty
+        # and writes a backtrace to stderr, so treat that as an error instead
+        # of silently passing.
+        if !result.success? && result.stdout.strip.empty?
+          return :fail, result.stderr
+        end
+
         results = result.stdout.split("\n\n")
         results.shift
         unless results.empty?

data/lib/overcommit/hook/pre_commit/solargraph.rb

@@ -10,7 +10,7 @@ module Overcommit
       #
       # @see https://github.com/castwide/solargraph
       class Solargraph < Base
-        MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)( -|:) /.freeze
+        MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)(?: -|:) /.freeze
 
         def run
           result = execute(command, args: applicable_files)

data/lib/overcommit/utils.rb

@@ -74,6 +74,31 @@ module Overcommit
           end
       end
 
+      # Returns an absolute path to a file in the current worktree's Git
+      # directory.
+      #
+      # @param path [String]
+      # @return [String]
+      def git_path(path)
+        cmd = %w[git rev-parse]
+        if GIT_VERSION < '2.5'
+          cmd << '--git-dir'
+        else
+          cmd += ['--git-path', path]
+        end
+
+        result = execute(cmd)
+        unless result.success?
+          raise Overcommit::Exceptions::InvalidGitRepo,
+                'Unable to determine Git path. ' \
+                'Not a recognizable Git repository!'
+        end
+
+        resolved_path = result.stdout.chomp("\n")
+        resolved_path = File.join(resolved_path, path) if GIT_VERSION < '2.5'
+        File.expand_path(resolved_path, Dir.pwd)
+      end
+
       # Remove ANSI escape sequences from a string.
       #
       # This is useful for stripping colorized output from external tools.

data/lib/overcommit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.72.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -49,14 +49,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.2
 description: Utility to install, configure, and extend Git hooks
 email:
 - shane@dasilva.io