overcommit 0.50.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f824ec83fa10a7b483e568728c32d9e2c15105d36bad7d76b4cb6ff3f162186e
-  data.tar.gz: a625d3bc126d5004119d534b31643ab5efc514b654f879afe2849816dd6eb673
+  metadata.gz: be2c25e83a10d44e88ecee58e5b2638e31e13562b0b272aa68e47656b095c582
+  data.tar.gz: 2b568ff85f265e88387b05b88e41146f2a341b3d22f571c461910c1833a76359
 SHA512:
-  metadata.gz: 189cce42c8f838a56d74602acad8d549ee08734f11fcfd76f744a32c5b15799c35c0ee1316ec2fb3270679b07b70af97834e7e6ce38ec38d9301b0d0c22fc9fb
-  data.tar.gz: 136a4b200e1d74532c01a8b850b20f98624ba03cb6ef0e08bb633fcbd5cea86b1d730010fd7bd358fa2400497486003fa013b4d2d75106b26876eb565d15e45e
+  metadata.gz: 4ae077600ff211f4bbc13a6dd97e1fe8ab4a625fb8918751f1238ee7b9d832f686cdaa42e9e2f1be5f2da0a150fd008532e45a3c45b48f23a3bb118a1d190597
+  data.tar.gz: 4db41972b13aa4c47c230fca0828f4a1d8d7491a09e8e753f0db27bd9f8cf1906b618ad0612e7dbfc84aa3e532529e4d2b41092f85e7bad91b303cd7f7e01017

data/lib/overcommit/hook_context/commit_msg.rb

@@ -34,7 +34,9 @@ module Overcommit::HookContext
     end
 
     def post_fail_message
-      "Failed commit message:\n" + commit_message_lines.join
+      "Failed commit message:\n#{commit_message_lines.join.chomp}\n\n" \
+      "Try again with your existing commit message by running:\n" \
+      "git commit --edit --file=#{commit_message_file}"
     end
 
     private

data/lib/overcommit/hook_context/pre_commit.rb

@@ -49,29 +49,15 @@ module Overcommit::HookContext
       Overcommit::GitRepo.store_merge_state
       Overcommit::GitRepo.store_cherry_pick_state
 
-      if !initial_commit? && any_changes?
-        @stash_attempted = true
-
-        stash_message = "Overcommit: Stash of repo state before hook run at #{Time.now}"
-        result = Overcommit::Utils.with_environment('GIT_LITERAL_PATHSPECS' => '0') do
-          Overcommit::Utils.execute(
-            %w[git -c commit.gpgsign=false stash save --keep-index --quiet] + [stash_message]
-          )
-        end
-
-        unless result.success?
-          # Failure to stash in this case is likely due to a configuration
-          # issue (e.g. author/email not set or GPG signing key incorrect)
-          raise Overcommit::Exceptions::HookSetupFailed,
-                "Unable to setup environment for #{hook_script_name} hook run:" \
-                "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
-        end
+      # Don't attempt to stash changes if all changes are staged, as this
+      # prevents us from modifying files at all, which plays better with
+      # editors/tools which watch for file changes.
+      if !initial_commit? && unstaged_changes?
+        stash_changes
 
-        @changes_stashed = `git stash list -1`.include?(stash_message)
+        # While running hooks make it appear as if nothing changed
+        restore_modified_times
       end
-
-      # While running the hooks make it appear as if nothing changed
-      restore_modified_times
     end
 
     # Restore unstaged changes and reset file modification times so it appears
@@ -82,19 +68,14 @@ module Overcommit::HookContext
     # modification time on the file was newer. This helps us play more nicely
     # with file watchers.
     def cleanup_environment
-      unless initial_commit? || (@stash_attempted && !@changes_stashed)
-        clear_working_tree # Ensure working tree is clean before restoring it
-        restore_modified_times
-      end
-
       if @changes_stashed
+        clear_working_tree
         restore_working_tree
         restore_modified_times
       end
 
       Overcommit::GitRepo.restore_merge_state
       Overcommit::GitRepo.restore_cherry_pick_state
-      restore_modified_times
     end
 
     # Get a list of added, copied, or modified files that have been staged.
@@ -140,6 +121,27 @@ module Overcommit::HookContext
 
     private
 
+    def stash_changes
+      @stash_attempted = true
+
+      stash_message = "Overcommit: Stash of repo state before hook run at #{Time.now}"
+      result = Overcommit::Utils.with_environment('GIT_LITERAL_PATHSPECS' => '0') do
+        Overcommit::Utils.execute(
+          %w[git -c commit.gpgsign=false stash save --keep-index --quiet] + [stash_message]
+        )
+      end
+
+      unless result.success?
+        # Failure to stash in this case is likely due to a configuration
+        # issue (e.g. author/email not set or GPG signing key incorrect)
+        raise Overcommit::Exceptions::HookSetupFailed,
+              "Unable to setup environment for #{hook_script_name} hook run:" \
+              "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
+      end
+
+      @changes_stashed = `git stash list -1`.include?(stash_message)
+    end
+
     # Clears the working tree so that the stash can be applied.
     def clear_working_tree
       removed_submodules = Overcommit::GitRepo.staged_submodule_removals
@@ -172,14 +174,11 @@ module Overcommit::HookContext
       end
     end
 
-    # Returns whether there are any changes to the working tree, staged or
-    # otherwise.
-    def any_changes?
-      modified_files = `git status -z --untracked-files=no`.
-        split("\0").
-        map { |line| line.gsub(/[^\s]+\s+(.+)/, '\\1') }
-
-      modified_files.any?
+    # Returns whether there are any changes to tracked files which have not yet
+    # been staged.
+    def unstaged_changes?
+      result = Overcommit::Utils.execute(%w[git --no-pager diff --quiet])
+      !result.success?
     end
 
     # Stores the modification times for all modified files to make it appear like

data/lib/overcommit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.51.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess