overcommit 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe6329a0cba58948e9ee76c415c994a7853076e
-  data.tar.gz: 8ccb39fc02ed962de60f1dd89398ed77e6c63187
+  metadata.gz: 9f071e1a8038ef082833913a8eb83e6bfb44b371
+  data.tar.gz: eb442b2dc4457f8173f9fff48572f575839c39e9
 SHA512:
-  metadata.gz: 8239e6a77a599153d4f6d30a23b329f7aa6d2c6b46ed001ce9dc1b0f4a3014b17fa65de8f8b004956271d989eb9a200dee2ee67ebb782e1bfa82b60fa2623744
-  data.tar.gz: 2e569ffcb8e328e0033913866e12230674b6ff42df2c955df0d0e87b0bdaa03fc0e628628bae01b42e68ba471d5cdb3b1ff26862c9baffc0916f3e9d550b7ab4
+  metadata.gz: c2e2faad1aea169d67e252967d22397bf05a4511fdb5247a57f3b2d12e66fa186ea594a24819619e648d56d90b30a965e643027e320e8b4340c785f31e6ae4b9
+  data.tar.gz: a8b53b06f1ab3b4eb6cbf31cf77abfdf053a7af1719f2b0e1482ca5c1e4ea62082357d00a921415286f8340675e9734cad1d73d0a69fd0dd261bf6194ef43b27

data/config/default.yml

@@ -26,6 +26,11 @@ CommitMsg:
     enabled: true
     description: 'Checking subject capitalization'
 
+  EmptyMessage:
+    enabled: true
+    description: 'Checking for empty commit message'
+    quiet: true
+
   GerritChangeId:
     enabled: false
     description: 'Ensuring Gerrit Change-Id is present'

data/config/starter.yml

@@ -16,7 +16,7 @@
 # Uncomment the following lines to make the configuration take effect.
 
 #PreCommit:
-#  Rubocop:
+#  RuboCop:
 #    on_warn: fail # Treat all warnings as failures
 #
 #  TrailingWhitespace:

data/lib/overcommit/configuration.rb

@@ -162,8 +162,12 @@ module Overcommit
     end
 
     def hook_enabled?(hook_context_or_type, hook_name)
-      hook_type = hook_context_or_type.is_a?(String) ? hook_context_or_type :
-                                                       hook_context_or_type.hook_class_name
+      hook_type =
+        if hook_context_or_type.is_a?(String)
+          hook_context_or_type
+        else
+          hook_context_or_type.hook_class_name
+        end
 
       individual_enabled = @hash[hook_type].fetch(hook_name, {})['enabled']
       return individual_enabled unless individual_enabled.nil?

data/lib/overcommit/git_repo.rb

@@ -107,7 +107,7 @@ module Overcommit
     # @return [Array<String>] list of absolute file paths
     def list_files(paths = [], options = {})
       ref = options[:ref] || 'HEAD'
-      `git ls-tree --name-only #{ref} #{paths.join(' ')}`.
+      `git ls-tree --name-only #{ref} "#{paths.join('" "')}"`.
         split(/\n/).
         map { |relative_file| File.expand_path(relative_file) }.
         reject { |file| File.directory?(file) } # Exclude submodule directories

data/lib/overcommit/hook/base.rb

@@ -42,38 +42,13 @@ module Overcommit::Hook
       if output = check_for_requirements
         status = :fail
       else
-        status, output = process_hook_return_value(run)
+        result = Overcommit::Utils.with_environment(@config.fetch('env', {})) { run }
+        status, output = process_hook_return_value(result)
       end
 
       [transform_status(status), output]
     end
 
-    # Converts the hook's return value into a canonical form of a tuple
-    # containing status (pass/warn/fail) and output.
-    #
-    # This is intended to support various shortcuts for writing hooks so that
-    # hook authors don't need to work with {Overcommit::Hook::Message} objects
-    # for simple pass/fail hooks. It also saves you from needing to manually
-    # encode logic like "if there are errors, fail; if there are warnings, warn,
-    # otherwise pass." by simply returning an array of
-    # {Overcommit::Hook::Message} objects.
-    #
-    # @param hook_return_value [Symbol, Array<Symbol,String>, Array<Message>]
-    # @return [Array<Symbol,String>] tuple of status and output
-    def process_hook_return_value(hook_return_value)
-      if hook_return_value.is_a?(Array) &&
-         (hook_return_value.first.is_a?(Message) || hook_return_value.empty?)
-        # Process messages into a status and output
-        Overcommit::MessageProcessor.new(
-          self,
-          @config['problem_on_unmodified_line'],
-        ).hook_result(hook_return_value)
-      else
-        # Otherwise return as-is
-        hook_return_value
-      end
-    end
-
     def name
       self.class.name.split('::').last
     end
@@ -230,6 +205,32 @@ module Overcommit::Hook
       output.join("\n")
     end
 
+    # Converts the hook's return value into a canonical form of a tuple
+    # containing status (pass/warn/fail) and output.
+    #
+    # This is intended to support various shortcuts for writing hooks so that
+    # hook authors don't need to work with {Overcommit::Hook::Message} objects
+    # for simple pass/fail hooks. It also saves you from needing to manually
+    # encode logic like "if there are errors, fail; if there are warnings, warn,
+    # otherwise pass." by simply returning an array of
+    # {Overcommit::Hook::Message} objects.
+    #
+    # @param hook_return_value [Symbol, Array<Symbol,String>, Array<Message>]
+    # @return [Array<Symbol,String>] tuple of status and output
+    def process_hook_return_value(hook_return_value)
+      if hook_return_value.is_a?(Array) &&
+         (hook_return_value.first.is_a?(Message) || hook_return_value.empty?)
+        # Process messages into a status and output
+        Overcommit::MessageProcessor.new(
+          self,
+          @config['problem_on_unmodified_line'],
+        ).hook_result(hook_return_value)
+      else
+        # Otherwise return as-is
+        hook_return_value
+      end
+    end
+
     # Transforms the hook's status based on custom configuration.
     #
     # This allows users to change failures into warnings, or vice versa.

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

@@ -0,0 +1,10 @@
+module Overcommit::Hook::CommitMsg
+  # Checks that the commit message is not empty
+  class EmptyMessage < Base
+    def run
+      return :pass unless empty_message?
+
+      [:fail, 'Commit message should not be empty']
+    end
+  end
+end

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

@@ -5,6 +5,8 @@ module Overcommit::Hook::CommitMsg
   # the reality is that if you want to _ensure_ the Change-Id is included then
   # you need to do it in a commit-msg hook. This is because the user could still
   # edit the message after a prepare-commit-msg hook was run.
+  #
+  # @see https://code.google.com/p/gerrit/
   class GerritChangeId < Base
     SCRIPT_LOCATION = Overcommit::Utils.script_path('gerrit-change-id')
 

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

@@ -1,7 +1,9 @@
 require 'tempfile'
 
 module Overcommit::Hook::CommitMsg
-  # Checks the commit message for potential misspellings
+  # Checks the commit message for potential misspellings with `hunspell`.
+  #
+  # @see http://hunspell.sourceforge.net/
   class SpellCheck < Base
     Misspelling = Struct.new(:word, :suggestions)
 

data/lib/overcommit/hook/post_checkout/index_tags.rb

@@ -2,6 +2,8 @@ require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostCheckout
   # Updates ctags index for all source code in the repository.
+  #
+  # @see {Overcommit::Hook::Shared::IndexTags}
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
   end

data/lib/overcommit/hook/post_commit/git_guilt.rb

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PostCommit
   # Calculates the change in blame since the last revision.
+  #
+  # @see https://www.npmjs.com/package/git-guilt
   class GitGuilt < Base
     PLUS_MINUS_REGEX = /^(.*?)(?:(\++)|(-+))$/
     GREEN = 32

data/lib/overcommit/hook/post_commit/index_tags.rb

@@ -2,6 +2,8 @@ require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostCommit
   # Updates ctags index for all source code in the repository.
+  #
+  # @see {Overcommit::Hook::Shared::IndexTags}
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
   end

data/lib/overcommit/hook/post_merge/index_tags.rb

@@ -2,6 +2,8 @@ require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostMerge
   # Updates ctags index for all source code in the repository.
+  #
+  # @see {Overcommit::Hook::Shared::IndexTags}
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
   end

data/lib/overcommit/hook/post_rewrite/index_tags.rb

@@ -2,6 +2,8 @@ require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostRewrite
   # Updates ctags index for all source code in the repository.
+  #
+  # @see {Overcommit::Hook::Shared::IndexTags}
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
 

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

@@ -1,6 +1,8 @@
 module Overcommit::Hook::PreCommit
   # Check if local Berksfile.lock matches Berksfile when either changes, unless
   # Berksfile.lock is ignored by git.
+  #
+  # @see http://berkshelf.com/
   class BerksfileCheck < Base
     LOCK_FILE = 'Berksfile.lock'
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `brakeman` against any modified Ruby/Rails files.
+  #
+  # @see http://brakemanscanner.org/
   class Brakeman < Base
     def run
       result = execute(command + [applicable_files.join(',')])

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

@@ -1,6 +1,8 @@
 module Overcommit::Hook::PreCommit
   # Check if local Gemfile.lock matches Gemfile when either changes, unless
   # Gemfile.lock is ignored by git.
+  #
+  # @see http://bundler.io/
   class BundleCheck < Base
     LOCK_FILE = 'Gemfile.lock'
 

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

@@ -3,8 +3,13 @@ module Overcommit::Hook::PreCommit
   # Adapted from https://github.com/pre-commit/pre-commit-hooks
   class CaseConflicts < Base
     def run
-      paths = Set.new(applicable_files.map { |file| File.dirname(file) + File::SEPARATOR })
-      repo_files = Set.new(Overcommit::GitRepo.list_files(paths.to_a) + applicable_files)
+      repo_files = Set.new(applicable_files)
+
+      unless Overcommit::GitRepo.initial_commit?
+        paths = repo_files.map { |file| File.dirname(file) + File::SEPARATOR }
+        repo_files += Overcommit::GitRepo.list_files(paths)
+      end
+
       conflict_hash = repo_files.classify(&:downcase).
         select { |_, files| files.size > 1 }
       conflict_files = applicable_files.

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
-  # Runs `chamber secure` against any modified Chamber settings files
+  # Runs `chamber secure` against any modified Chamber settings files.
+  #
+  # @see https://github.com/thekompanee/chamber
   class ChamberSecurity < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `coffeelint` against any modified CoffeeScript files.
+  #
+  # @see http://www.coffeelint.org/
   class CoffeeLint < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `csslint` against any modified CSS files.
+  #
+  # @see https://github.com/CSSLint/csslint
   class CssLint < Base
     MESSAGE_REGEX = /
       ^(?<file>[^:]+):\s

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `eslint` against any modified JavaScript files.
+  #
+  # @see http://eslint.org/
   class EsLint < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `golint` against any modified Golang files.
+  #
+  # @see https://github.com/golang/lint
   class GoLint < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `go vet` against any modified Golang files.
+  #
+  # @see https://godoc.org/code.google.com/p/go-zh.tools/cmd/vet
   class GoVet < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `haml-lint` against any modified HAML files.
+  #
+  # @see https://github.com/brigade/haml-lint/
   class HamlLint < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `tidy` against any modified HTML files.
+  #
+  # @see http://www.html-tidy.org/
   class HtmlTidy < Base
     MESSAGE_REGEX = /
       ^(?<file>[^:]+):\s

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Checks for images that can be optimized with `image_optim`.
+  #
+  # @see https://github.com/toy/image_optim
   class ImageOptim < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `checkstyle` against any modified Java files.
+  #
+  # @see http://checkstyle.sourceforge.net/
   class JavaCheckstyle < Base
     MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+)/
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `jshint` against any modified JavaScript files.
+  #
+  # @see http://jshint.com/
   class JsHint < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `jslint` against any modified JavaScript files.
+  #
+  # @see http://www.jslint.com/
   class JsLint < Base
     MESSAGE_REGEX = /(?<file>[^:]+):(?<line>\d+)/
 

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

@@ -1,6 +1,8 @@
 module Overcommit::Hook::PreCommit
   # Runs `jscs` (JavaScript Code Style Checker) against any modified JavaScript
   # files.
+  #
+  # @see http://jscs.info/
   class Jscs < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `jsl` against any modified JavaScript files.
+  #
+  # @see http://www.javascriptlint.com/
   class Jsl < Base
     MESSAGE_REGEX = /(?<file>.+)\((?<line>\d+)\):(?<type>[^:]+)/
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `pep257` against any modified Python files.
+  #
+  # @see https://pypi.python.org/pypi/pep257
   class Pep257 < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `pep8` against any modified Python files.
+  #
+  # @see https://pypi.python.org/pypi/pep8
   class Pep8 < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `pyflakes` against any modified Python files.
+  #
+  # @see https://pypi.python.org/pypi/pyflakes
   class Pyflakes < Base
     MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+):/
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `pylint` against any modified Python files.
+  #
+  # @see http://www.pylint.org/
   class Pylint < Base
     MESSAGE_REGEX = /^(?<file>.+):(?<line>\d+):(?<type>[CEFRW])/
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `flake8` against any modified Python files.
+  #
+  # @see https://pypi.python.org/pypi/flake8
   class PythonFlake8 < Base
     MESSAGE_REGEX = /^(?<file>.+):(?<line>\d+):\d+:\s(?<type>\w\d+)/
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `reek` against any modified Ruby files.
+  #
+  # @see https://github.com/troessner/reek
   class Reek < Base
     def run
       result = execute(command + applicable_files)
@@ -9,7 +11,7 @@ module Overcommit::Hook::PreCommit
 
       extract_messages(
         output,
-        /^(?<file>[^:]+):(?<line>\d+):/,
+        /^\s*(?<file>[^:]+):(?<line>\d+):/,
       )
     end
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `rubocop` against any modified Ruby files.
+  #
+  # @see http://batsov.com/rubocop/
   class RuboCop < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `ruby-lint` against any modified Ruby files.
+  #
+  # @see https://github.com/YorickPeterse/ruby-lint
   class RubyLint < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `scalariform` against any modified Scala files.
+  #
+  # @see https://github.com/mdr/scalariform
   class Scalariform < Base
     MESSAGE_REGEX = /^\[(?<type>FAILED|ERROR)\]\s+(?<file>.+)/
 

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `scalastyle` against any modified Scala files.
+  #
+  # @see http://www.scalastyle.org/
   class Scalastyle < Base
     MESSAGE_REGEX = /
       ^(?<type>error|warning)\s

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `scss-lint` against any modified SCSS files.
+  #
+  # @see https://github.com/brigade/scss-lint
   class ScssLint < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `semistandard` against any modified JavaScript files.
+  #
+  # @see https://github.com/Flet/semistandard
   class SemiStandard < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `shellcheck` against any modified shell script files.
+  #
+  # @see http://www.shellcheck.net/
   class ShellCheck < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('note') ? :warning : :error

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `slim-lint` against any modified Slim templates.
+  #
+  # @see https://github.com/sds/slim-lint
   class SlimLint < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `standard` against any modified JavaScript files.
+  #
+  # @see https://github.com/feross/standard
   class Standard < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `travis-lint` against any modified Travis CI files.
+  #
+  # @see https://github.com/travis-ci/travis.rb
   class TravisLint < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `vint` against any modified Vim script files.
+  #
+  # @see https://github.com/Kuniwak/vint
   class Vint < Base
     def run
       result = execute(command + applicable_files)

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `w3c_validators` against any modified CSS files.
+  #
+  # @see https://github.com/alexdunae/w3c_validators
   class W3cCss < Base
     def run
       collect_messages

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `w3c_validators` against any modified HTML files.
+  #
+  # @see https://github.com/alexdunae/w3c_validators
   class W3cHtml < Base
     def run
       collect_messages

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

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `xmllint` against any modified XML files.
+  #
+  # @see http://xmlsoft.org/xmllint.html
   class XmlLint < Base
     MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+):/
 

data/lib/overcommit/hook/pre_push/r_spec.rb

@@ -1,5 +1,7 @@
 module Overcommit::Hook::PrePush
   # Runs `rspec` test suite before push
+  #
+  # @see http://rspec.info/
   class RSpec < Base
     def run
       result = execute(command)

data/lib/overcommit/hook/pre_rebase/base.rb

@@ -6,6 +6,7 @@ module Overcommit::Hook::PreRebase
     extend Forwardable
 
     def_delegators :@context,
-                   :upstream_branch, :rebased_branch, :fast_forward?, :rebased_commits
+                   :upstream_branch, :rebased_branch, :detached_head?,
+                   :fast_forward?, :rebased_commits
   end
 end

data/lib/overcommit/hook/shared/index_tags.rb

@@ -1,6 +1,8 @@
 module Overcommit::Hook::Shared
   # Shared code used by all IndexTags hooks. It runs ctags in the background so
   # your tag definitions are up-to-date.
+  #
+  # @see http://ctags.sourceforge.net/
   module IndexTags
     def run
       execute_in_background([Overcommit::Utils.script_path('index-tags')])

data/lib/overcommit/hook_context/pre_commit.rb

@@ -88,19 +88,27 @@ module Overcommit::HookContext
     # Renames and deletions are ignored, since there should be nothing to check.
     def modified_files
       unless @modified_files
-        @modified_files = Overcommit::GitRepo.modified_files(staged: true)
+        currently_staged = Overcommit::GitRepo.modified_files(staged: true)
+        @modified_files = currently_staged
 
         # Include files modified in last commit if amending
         if amendment?
           subcmd = 'show --format=%n'
-          @modified_files += Overcommit::GitRepo.modified_files(subcmd: subcmd)
+          previously_modified = Overcommit::GitRepo.modified_files(subcmd: subcmd)
+
+          # Filter out non-existent files. This could happen if a file was
+          # renamed as part of the amendment, leading to the old file no longer
+          # existing.
+          previously_modified.select! { |file| File.exist?(file) }
 
           # Filter out directories. This could happen when changing a symlink to
           # a directory as part of an amendment, since the symlink will still
           # appear as a file, but the actual working tree will have a directory.
-          @modified_files.reject! do |file|
+          previously_modified.reject! do |file|
             File.directory?(file) && !File.symlink?(file)
           end
+
+          @modified_files |= previously_modified
         end
       end
       @modified_files

data/lib/overcommit/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.25.0'
+  VERSION = '0.26.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -105,6 +105,7 @@ files:
 - lib/overcommit/hook/base.rb
 - lib/overcommit/hook/commit_msg/base.rb
 - lib/overcommit/hook/commit_msg/capitalized_subject.rb
+- lib/overcommit/hook/commit_msg/empty_message.rb
 - lib/overcommit/hook/commit_msg/gerrit_change_id.rb
 - lib/overcommit/hook/commit_msg/hard_tabs.rb
 - lib/overcommit/hook/commit_msg/russian_novel.rb