From c6628e22b322bffe8be7935a013355bd510960eb Mon Sep 17 00:00:00 2001
From: Daniel <1732408+chiubaka@users.noreply.github.com>
Date: Mon, 20 Aug 2018 01:09:42 +0200
Subject: [PATCH 001/223] Fix TsLint defaults (#594)

Removes flags from TsLint default config, which appeared to break linting.
The "prose" option for `-t` is also default, so shouldn't be necessary to specify as a flag?
---
 config/default.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index ce602d84..98546902 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -727,7 +727,6 @@ PreCommit:
       description: 'Analyze with TSLint'
       required_executable: 'tslint'
       install_command: 'npm install -g tslint typescript'
-      flags: ['--t=prose']
       include: '**/*.ts'
 
   TrailingWhitespace:

From b91797784aa9abe79b4f057f296a42044aa59e17 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 1 Sep 2018 22:56:13 -0700
Subject: [PATCH 002/223] Update change log

While here also fix a capitalization typo for the Stylelint hook.
---
 CHANGELOG.md | 2 ++
 README.md    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7d2e114..05f6d30b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 * Add `PhpCsFixer` pre-commit hook
 * Add `YardCoverage` pre-commit hook
 * Add `Flay` pre-commit hook
+* Add `Stylelint` pre-commit hook
+* Fix `TsLint` default flags to work with `tslint` 5.11+
 
 ## 0.45.0
 
diff --git a/README.md b/README.md
index 0127cedc..0e750afd 100644
--- a/README.md
+++ b/README.md
@@ -546,7 +546,7 @@ issue](https://github.com/brigade/overcommit/issues/238) for more details.
 * [SlimLint](lib/overcommit/hook/pre_commit/slim_lint.rb)
 * [Sqlint](lib/overcommit/hook/pre_commit/sqlint.rb)
 * [Standard](lib/overcommit/hook/pre_commit/standard.rb)
-* [StyleLint](lib/overcommit/hook/pre_commit/stylelint.rb)
+* [Stylelint](lib/overcommit/hook/pre_commit/stylelint.rb)
 * [TrailingWhitespace](lib/overcommit/hook/pre_commit/trailing_whitespace.rb)
 * [TravisLint](lib/overcommit/hook/pre_commit/travis_lint.rb)
 * [TsLint](lib/overcommit/hook/pre_commit/ts_lint.rb)

From 60f18f485c19e8ba5c578d984ef0caacf58eb966 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 1 Sep 2018 22:59:32 -0700
Subject: [PATCH 003/223] Cut version 0.46.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05f6d30b..4e4f1ec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.46.0
 
 * Fix `Credo` pre-commit hook to lint applicable files only rather than
   all files
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index a9ecf0ad..49954888 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.45.0'.freeze
+  VERSION = '0.46.0'.freeze
 end

From bcef6bb8a102c143cc77f4327161d7d8dddae90f Mon Sep 17 00:00:00 2001
From: Viacheslav Ptsarev <leemour@gmail.com>
Date: Thu, 27 Sep 2018 19:25:07 +0300
Subject: [PATCH 004/223] Update validator_uri for W3cHtml (#598)

Replace deprecated URL.
---
 config/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index 98546902..bfc73020 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -769,7 +769,7 @@ PreCommit:
     description: 'Analyze with W3C HTML validation service'
     required_library: 'w3c_validators'
     install_command: 'gem install w3c_validators'
-    validator_uri: 'http://validator.w3.org/check'
+    validator_uri: 'https://validator.w3.org/nu'
     charset: 'utf-8'
     doctype: 'HTML5'
     include:

From 47962f705968921c865aa400feae5f3abdfe54a2 Mon Sep 17 00:00:00 2001
From: Daniel Luna <dancluna@gmail.com>
Date: Mon, 8 Oct 2018 03:16:23 -0300
Subject: [PATCH 005/223] prepare-commit-message hook (#520)

* Add prepare-commit-msg hook

* This commit adds the ReplaceBranch prepare-commit-msg hook, which, when
correctly configured, automatically generates a commit message template based on
the branch name.

Groups captured in the branch_pattern regex can be used in replacement_text;
see the accompanying spec for details. Also, replacement_text can be a path to
a file, whose text will be processed following the same rules.

* Address code review comments relating to concurrency
and default.yml config file

* Updating ReplaceBranch hook

* Fixing CI errors

* Hopefully fixing Appveyor windows build

* Not removing test file in Appveyor due to build errors

* Fixing replace_branch with the new
commit_message_source API
---
 config/default.yml                            |  14 +++
 .../hook/prepare_commit_msg/base.rb           |  23 ++++
 .../hook/prepare_commit_msg/replace_branch.rb |  50 ++++++++
 .../hook_context/prepare_commit_msg.rb        |  32 +++++
 .../hook/prepare_commit_msg/base_spec.rb      |  45 +++++++
 .../prepare_commit_msg/replace_branch_spec.rb |  67 ++++++++++
 .../hook_context/prepare_commit_msg_spec.rb   |  24 ++++
 spec/overcommit/utils_spec.rb                 |   4 +-
 template-dir/hooks/prepare-commit-msg         | 115 ++++++++++++++++++
 9 files changed, 372 insertions(+), 2 deletions(-)
 create mode 100644 lib/overcommit/hook/prepare_commit_msg/base.rb
 create mode 100644 lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
 create mode 100644 lib/overcommit/hook_context/prepare_commit_msg.rb
 create mode 100644 spec/overcommit/hook/prepare_commit_msg/base_spec.rb
 create mode 100644 spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
 create mode 100644 spec/overcommit/hook_context/prepare_commit_msg_spec.rb
 create mode 100755 template-dir/hooks/prepare-commit-msg

diff --git a/config/default.yml b/config/default.yml
index bfc73020..6d86e30e 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1143,6 +1143,20 @@ PostRewrite:
       - 'package.json'
       - 'yarn.lock'
 
+# Hooks that run during the `prepare-commit-msg` hook.
+PrepareCommitMsg:
+  ALL:
+    requires_files: false
+    required: false
+    quiet: false
+
+  ReplaceBranch:
+    enabled: false
+    description: 'Prepends the commit message with text based on the branch name'
+    branch_pattern: '\A.*\w+[-_](\d+).*\z'
+    replacement_text: '[#\1]'
+    on_fail: warn
+
 # Hooks that run during `git push`, after remote refs have been updated but
 # before any objects have been transferred.
 PrePush:
diff --git a/lib/overcommit/hook/prepare_commit_msg/base.rb b/lib/overcommit/hook/prepare_commit_msg/base.rb
new file mode 100644
index 00000000..c278b5a6
--- /dev/null
+++ b/lib/overcommit/hook/prepare_commit_msg/base.rb
@@ -0,0 +1,23 @@
+require 'forwardable'
+
+module Overcommit::Hook::PrepareCommitMsg
+  # Functionality common to all prepare-commit-msg hooks.
+  class Base < Overcommit::Hook::Base
+    extend Forwardable
+
+    def_delegators :@context,
+                   :commit_message_filename, :commit_message_source, :commit, :lock
+
+    def modify_commit_message
+      raise 'This expects a block!' unless block_given?
+      # NOTE: this assumes all the hooks of the same type share the context's
+      # memory. If that's not the case, this won't work.
+      lock.synchronize do
+        contents = File.read(commit_message_filename)
+        File.open(commit_message_filename, 'w') do |f|
+          f << (yield contents)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
new file mode 100644
index 00000000..8a5c1f82
--- /dev/null
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -0,0 +1,50 @@
+module Overcommit::Hook::PrepareCommitMsg
+  # Prepends the commit message with a message based on the branch name.
+  # It's possible to reference parts of the branch name through the captures in
+  # the `branch_pattern` regex.
+  class ReplaceBranch < Base
+    def run
+      return :pass unless !commit_message_source ||
+        commit_message_source == :commit # NOTE: avoid 'merge' and 'rebase'
+      Overcommit::Utils.log.debug(
+        "Checking if '#{Overcommit::GitRepo.current_branch}' matches #{branch_pattern}"
+      )
+      if branch_pattern.match(Overcommit::GitRepo.current_branch)
+        Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
+        modify_commit_message do |old_contents|
+          "#{new_template}\n#{old_contents}"
+        end
+        :pass
+      else
+        :warn
+      end
+    end
+
+    def new_template
+      @new_template ||= Overcommit::GitRepo.current_branch.gsub(branch_pattern, replacement_text)
+    end
+
+    def branch_pattern
+      @branch_pattern ||=
+        begin
+          pattern = config['branch_pattern']
+          Regexp.new((pattern || '').empty? ? '\A.*\w+[-_](\d+).*\z' : pattern)
+        end
+    end
+
+    def replacement_text
+      @replacement_text ||=
+        begin
+          if File.exist?(replacement_text_config)
+            File.read(replacement_text_config)
+          else
+            replacement_text_config
+          end
+        end
+    end
+
+    def replacement_text_config
+      @replacement_text_config ||= config['replacement_text']
+    end
+  end
+end
diff --git a/lib/overcommit/hook_context/prepare_commit_msg.rb b/lib/overcommit/hook_context/prepare_commit_msg.rb
new file mode 100644
index 00000000..d5bbf993
--- /dev/null
+++ b/lib/overcommit/hook_context/prepare_commit_msg.rb
@@ -0,0 +1,32 @@
+module Overcommit::HookContext
+  # Contains helpers related to contextual information used by prepare-commit-msg
+  # hooks.
+  class PrepareCommitMsg < Base
+    # Returns the name of the file that contains the commit log message
+    def commit_message_filename
+      @args[0]
+    end
+
+    # Returns the source of the commit message, and can be: message (if a -m or
+    # -F option was given); template (if a -t option was given or the
+    # configuration option commit.template is set); merge (if the commit is a
+    # merge or a .git/MERGE_MSG file exists); squash (if a .git/SQUASH_MSG file
+    # exists); or commit, followed by a commit SHA-1 (if a -c, -C or --amend
+    # option was given)
+    def commit_message_source
+      @args[1].to_sym if @args[1]
+    end
+
+    # Returns the commit's SHA-1.
+    # If commit_message_source is :commit, it's passed through the command-line.
+    def commit_message_source_ref
+      @args[2] || `git rev-parse HEAD`
+    end
+
+    # Lock for the pre_commit_message file. Should be shared by all
+    # prepare-commit-message hooks
+    def lock
+      @lock ||= Monitor.new
+    end
+  end
+end
diff --git a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
new file mode 100644
index 00000000..fffa2a43
--- /dev/null
+++ b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'overcommit/hook_context/prepare_commit_msg'
+
+describe Overcommit::Hook::PrepareCommitMsg::Base do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { Overcommit::HookContext::PrepareCommitMsg.new(config, [], StringIO.new) }
+  let(:printer) { double('printer') }
+
+  context 'when multiple hooks run simultaneously' do
+    let(:hook_1) { described_class.new(config, context) }
+    let(:hook_2) { described_class.new(config, context) }
+
+    let(:tempfile) { 'test-prepare-commit-msg.txt' }
+
+    let(:initial_content) { "This is a test\n" }
+
+    before do
+      File.open(tempfile, 'w') do |f|
+        f << initial_content
+      end
+    end
+
+    after do
+      File.delete(tempfile)
+    end
+
+    it 'works well with concurrency' do
+      allow(context).to receive(:commit_message_filename).and_return(tempfile)
+      allow(hook_1).to receive(:run) do
+        hook_1.modify_commit_message do |contents|
+          "alpha\n" + contents
+        end
+      end
+      allow(hook_2).to receive(:run) do
+        hook_2.modify_commit_message do |contents|
+          contents + "bravo\n"
+        end
+      end
+      Thread.new { hook_1.run }
+      Thread.new { hook_2.run }
+      Thread.list.each { |t| t.join unless t == Thread.current }
+      expect(File.read(tempfile)).to match(/alpha\n#{initial_content}bravo\n/m)
+    end
+  end
+end
diff --git a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
new file mode 100644
index 00000000..ad3fd2d0
--- /dev/null
+++ b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'overcommit/hook_context/prepare_commit_msg'
+
+describe Overcommit::Hook::PrepareCommitMsg::ReplaceBranch do
+  let(:config) { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) do
+    Overcommit::HookContext::PrepareCommitMsg.new(
+      config, [prepare_commit_message_file, 'commit'], StringIO.new
+    )
+  end
+
+  let(:prepare_commit_message_file) { 'prepare_commit_message_file.txt' }
+
+  subject(:hook) { described_class.new(config, context) }
+
+  before do
+    File.open(prepare_commit_message_file, 'w')
+    allow(Overcommit::Utils).to receive_message_chain(:log, :debug)
+    allow(Overcommit::GitRepo).to receive(:current_branch).and_return(new_head)
+  end
+
+  after do
+    File.delete(prepare_commit_message_file) unless ENV['APPVEYOR']
+  end
+
+  let(:new_head) { 'userbeforeid-12345-branch-description' }
+
+  describe '#run' do
+    context 'when the checked out branch matches the pattern' do
+      it { is_expected.to pass }
+
+      context 'template contents' do
+        subject(:template) { hook.new_template }
+
+        before do
+          hook.stub(:replacement_text).and_return('Id is: \1')
+        end
+
+        it { is_expected.to eq('Id is: 12345') }
+      end
+    end
+
+    context 'when the checked out branch does not match the pattern' do
+      let(:new_head) { "this shouldn't match the default pattern" }
+
+      it { is_expected.to warn }
+    end
+  end
+
+  describe '#replacement_text' do
+    subject(:replacement_text) { hook.replacement_text }
+    let(:replacement_template_file) { 'valid_filename.txt' }
+    let(:replacement) { 'Id is: \1' }
+
+    context 'when the replacement text points to a valid filename' do
+      before do
+        hook.stub(:replacement_text_config).and_return(replacement_template_file)
+        File.stub(:exist?).and_return(true)
+        File.stub(:read).with(replacement_template_file).and_return(replacement)
+      end
+
+      describe 'it reads it as the replacement template' do
+        it { is_expected.to eq(replacement) }
+      end
+    end
+  end
+end
diff --git a/spec/overcommit/hook_context/prepare_commit_msg_spec.rb b/spec/overcommit/hook_context/prepare_commit_msg_spec.rb
new file mode 100644
index 00000000..9371fe6c
--- /dev/null
+++ b/spec/overcommit/hook_context/prepare_commit_msg_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'overcommit/hook_context/prepare_commit_msg'
+
+describe Overcommit::HookContext::PrepareCommitMsg do
+  let(:config) { double('config') }
+  let(:args) { [commit_message_filename, commit_message_source] }
+  let(:commit_message_filename) { 'message-template.txt' }
+  let(:commit_message_source) { :file }
+  let(:commit) { 'SHA-1 here' }
+  let(:input) { double('input') }
+  let(:context) { described_class.new(config, args, input) }
+
+  describe '#commit_message_filename' do
+    subject { context.commit_message_filename }
+
+    it { should == commit_message_filename }
+  end
+
+  describe '#commit_message_source' do
+    subject { context.commit_message_source }
+
+    it { should == commit_message_source }
+  end
+end
diff --git a/spec/overcommit/utils_spec.rb b/spec/overcommit/utils_spec.rb
index 4a39d1a9..76272cdb 100644
--- a/spec/overcommit/utils_spec.rb
+++ b/spec/overcommit/utils_spec.rb
@@ -118,7 +118,7 @@
     subject { described_class.supported_hook_types }
 
     # rubocop:disable Metrics/LineLength
-    it { should =~ %w[commit-msg pre-commit post-checkout post-commit post-merge post-rewrite pre-push pre-rebase] }
+    it { should =~ %w[commit-msg pre-commit post-checkout post-commit post-merge post-rewrite pre-push pre-rebase prepare-commit-msg] }
     # rubocop:enable Metrics/LineLength
   end
 
@@ -126,7 +126,7 @@
     subject { described_class.supported_hook_type_classes }
 
     # rubocop:disable Metrics/LineLength
-    it { should =~ %w[CommitMsg PreCommit PostCheckout PostCommit PostMerge PostRewrite PrePush PreRebase] }
+    it { should =~ %w[CommitMsg PreCommit PostCheckout PostCommit PostMerge PostRewrite PrePush PreRebase PrepareCommitMsg] }
     # rubocop:enable Metrics/LineLength
   end
 
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
new file mode 100755
index 00000000..b345d9c7
--- /dev/null
+++ b/template-dir/hooks/prepare-commit-msg
@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby
+
+# Entrypoint for Overcommit hook integration. Installing Overcommit will result
+# in all of your git hooks being copied from this file, allowing the framework
+# to manage your hooks for you.
+
+# Prevent a Ruby stack trace from appearing when we interrupt the hook.
+# Note that this will be overridden when Overcommit is loaded, since the
+# InterruptHandler will redefine the trap at that time.
+Signal.trap('INT') do
+  puts 'Hook run interrupted'
+  exit 130
+end
+
+# Allow hooks to be disabled via environment variable so git commands can be run
+# in scripts without Overcommit running hooks
+if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
+  exit
+end
+
+hook_type = File.basename($0)
+if hook_type == 'overcommit-hook'
+  puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
+       "by each hook in a repository's .git/hooks directory."
+  exit 64 # EX_USAGE
+end
+
+# Check if Overcommit should invoke a Bundler context for loading gems
+require 'yaml'
+# rubocop:disable Style/RescueModifier
+if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+
+  begin
+    Bundler.setup
+  rescue Bundler::BundlerError => ex
+    puts "Problem loading '#{gemfile}': #{ex.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+    exit 78 # EX_CONFIG
+  end
+end
+# rubocop:enable Style/RescueModifier
+
+begin
+  require 'overcommit'
+rescue LoadError
+  if gemfile
+    puts 'You have specified the `gemfile` option in your Overcommit ' \
+         'configuration but have not added the `overcommit` gem to ' \
+         "#{gemfile}."
+  else
+    puts 'This repository contains hooks installed by Overcommit, but the ' \
+         "`overcommit` gem is not installed.\n" \
+         'Install it with `gem install overcommit`.'
+  end
+
+  exit 64 # EX_USAGE
+end
+
+begin
+  logger = Overcommit::Logger.new(STDOUT)
+  Overcommit::Utils.log = logger
+
+  # Ensure master hook is up-to-date
+  installer = Overcommit::Installer.new(logger)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
+    exec($0, *ARGV) # Execute the updated hook with all original arguments
+  end
+
+  config = Overcommit::ConfigurationLoader.new(logger).load_repo_config
+
+  context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
+  config.apply_environment!(context, ENV)
+
+  printer = Overcommit::Printer.new(config, logger, context)
+  runner = Overcommit::HookRunner.new(config, logger, context, printer)
+
+  status = runner.run
+
+  exit(status ? 0 : 65) # 65 = EX_DATAERR
+rescue Overcommit::Exceptions::ConfigurationError => error
+  puts error
+  exit 78 # EX_CONFIG
+rescue Overcommit::Exceptions::HookContextLoadError => error
+  puts error
+  puts 'Are you running an old version of Overcommit?'
+  exit 69 # EX_UNAVAILABLE
+rescue Overcommit::Exceptions::HookLoadError,
+       Overcommit::Exceptions::InvalidHookDefinition => error
+  puts error.message
+  puts error.backtrace
+  exit 78 # EX_CONFIG
+rescue Overcommit::Exceptions::HookSetupFailed,
+       Overcommit::Exceptions::HookCleanupFailed => error
+  puts error.message
+  exit 74 # EX_IOERR
+rescue Overcommit::Exceptions::HookCancelled
+  puts 'You cancelled the hook run'
+  exit 130 # Ctrl-C cancel
+rescue Overcommit::Exceptions::InvalidGitRepo => error
+  puts error
+  exit 64 # EX_USAGE
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
+  puts error
+  puts "For more information, see #{Overcommit::REPO_URL}#security"
+  exit 1
+rescue Overcommit::Exceptions::InvalidHookSignature
+  exit 1
+rescue StandardError => error
+  puts error.message
+  puts error.backtrace
+  puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
+  exit 70 # EX_SOFTWARE
+end

From 6bf7c91886b215045408b25409afe1139885d947 Mon Sep 17 00:00:00 2001
From: David <davidgengenbach@users.noreply.github.com>
Date: Wed, 17 Oct 2018 04:59:56 +0200
Subject: [PATCH 006/223] Add support for new TsLint output format (#601)

---
 lib/overcommit/hook/pre_commit/ts_lint.rb     | 16 +++++++++----
 .../hook/pre_commit/ts_lint_spec.rb           | 24 +++++++++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/ts_lint.rb b/lib/overcommit/hook/pre_commit/ts_lint.rb
index 2a29865c..b91a9f04 100644
--- a/lib/overcommit/hook/pre_commit/ts_lint.rb
+++ b/lib/overcommit/hook/pre_commit/ts_lint.rb
@@ -2,16 +2,24 @@ module Overcommit::Hook::PreCommit
   # Runs `tslint` against modified TypeScript files.
   # @see http://palantir.github.io/tslint/
   class TsLint < Base
+    # example message:
+    # "src/file/anotherfile.ts[298, 1]: exceeds maximum line length of 140"
+    # or
+    # "ERROR: src/AccountController.ts[4, 28]: expected call-signature to have a typedef"
+    MESSAGE_REGEX = /^(?<type>.+: )?(?<file>.+?(?=\[))[^\d]+(?<line>\d+).*?/
+
     def run
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
 
-      # example message:
-      # src/file/anotherfile.ts[298, 1]: exceeds maximum line length of 140
+      output_lines = output.split("\n").map(&:strip).reject(&:empty?)
+      type_categorizer = ->(type) { type.nil? || type.include?('ERROR') ? :error : :warning }
+
       extract_messages(
-          output.split("\n"),
-          /^(?<file>.+?(?=\[))[^\d]+(?<line>\d+).*?/
+          output_lines,
+          MESSAGE_REGEX,
+          type_categorizer
       )
     end
   end
diff --git a/spec/overcommit/hook/pre_commit/ts_lint_spec.rb b/spec/overcommit/hook/pre_commit/ts_lint_spec.rb
index 76294735..7c3b0aa0 100644
--- a/spec/overcommit/hook/pre_commit/ts_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/ts_lint_spec.rb
@@ -36,12 +36,32 @@
 
     context 'and it reports an error' do
       before do
-        result.stub(:stdout).and_return([
+        result.stub(:stdout).and_return(
           'src/file/anotherfile.ts[298, 1]: exceeds maximum line length of 140'
-        ].join("\n"))
+        )
       end
 
       it { should fail_hook }
     end
+
+    context 'and it reports an error with an "ERROR" severity' do
+      before do
+        result.stub(:stdout).and_return(
+          'ERROR: src/AccountController.ts[4, 28]: expected call-signature to have a typedef'
+        )
+      end
+
+      it { should fail_hook }
+    end
+
+    context 'and it reports an warning' do
+      before do
+        result.stub(:stdout).and_return(
+          'WARNING: src/AccountController.ts[4, 28]: expected call-signature to have a typedef'
+        )
+      end
+
+      it { should warn }
+    end
   end
 end

From b5bd0cc91e46358c425950afeda2eff064ff0d22 Mon Sep 17 00:00:00 2001
From: Haris Dizdarevic <harisdizdarevic1@gmail.com>
Date: Tue, 23 Oct 2018 06:17:30 +0200
Subject: [PATCH 007/223] SwiftLint: Pre-commit hook (#603)

- Add SwiftLint to pre-commit hook
- Update README
---
 README.md                                     |  1 +
 config/default.yml                            |  8 ++++
 lib/overcommit/hook/pre_commit/swift_lint.rb  | 17 ++++++++
 .../hook/pre_commit/swift_lint_spec.rb        | 40 +++++++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/swift_lint.rb
 create mode 100644 spec/overcommit/hook/pre_commit/swift_lint_spec.rb

diff --git a/README.md b/README.md
index 0e750afd..aec14a91 100644
--- a/README.md
+++ b/README.md
@@ -538,6 +538,7 @@ issue](https://github.com/brigade/overcommit/issues/238) for more details.
 * [Reek](lib/overcommit/hook/pre_commit/reek.rb)
 * [RuboCop](lib/overcommit/hook/pre_commit/rubo_cop.rb)
 * [RubyLint](lib/overcommit/hook/pre_commit/ruby_lint.rb)
+* [SwiftLint](lib/overcommit/hook/pre_commit/swift_lint.rb)
 * [Scalariform](lib/overcommit/hook/pre_commit/scalariform.rb)
 * [Scalastyle](lib/overcommit/hook/pre_commit/scalastyle.rb)
 * [ScssLint](lib/overcommit/hook/pre_commit/scss_lint.rb)
diff --git a/config/default.yml b/config/default.yml
index 6d86e30e..e1c444ac 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -722,6 +722,14 @@ PreCommit:
       - '**/*.css'
       - '**/*.less'
 
+  SwiftLint:
+    enabled: false
+    description: 'Analyze with SwiftLint'
+    required_executable: 'swiftlint'
+    flags: ['lint', '--strict']
+    install_command: 'brew install swiftlint'
+    include: '**/*.swift'
+
   TsLint:
       enabled: false
       description: 'Analyze with TSLint'
diff --git a/lib/overcommit/hook/pre_commit/swift_lint.rb b/lib/overcommit/hook/pre_commit/swift_lint.rb
new file mode 100644
index 00000000..b417a384
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/swift_lint.rb
@@ -0,0 +1,17 @@
+module Overcommit::Hook::PreCommit
+  # Runs `swiftlint lint` against modified Swift files.
+  # @see https://github.com/realm/SwiftLint
+  class SwiftLint < Base
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+):(?<message>.*)/
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n").grep(MESSAGE_REGEX),
+        MESSAGE_REGEX
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/swift_lint_spec.rb b/spec/overcommit/hook/pre_commit/swift_lint_spec.rb
new file mode 100644
index 00000000..4da00f8c
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/swift_lint_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::SwiftLint do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.swift file2.swift])
+  end
+
+  context 'when SwiftLint exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when SwiftLint exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return([
+          'file1.swift:12: warning: message: details'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From 7396a271d1ad9f0c3121b40b796ac042f0307d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Sat, 27 Oct 2018 00:40:42 +0200
Subject: [PATCH 008/223] KtLint: Pre-commit hook

* Add KtLint pre-commit hook
* Update README
---
 README.md                                     |  1 +
 config/default.yml                            |  7 ++++
 lib/overcommit/hook/pre_commit/kt_lint.rb     | 17 ++++++++
 .../hook/pre_commit/kt_lint_spec.rb           | 40 +++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/kt_lint.rb
 create mode 100644 spec/overcommit/hook/pre_commit/kt_lint_spec.rb

diff --git a/README.md b/README.md
index aec14a91..7205fcc1 100644
--- a/README.md
+++ b/README.md
@@ -514,6 +514,7 @@ issue](https://github.com/brigade/overcommit/issues/238) for more details.
 * [JsLint](lib/overcommit/hook/pre_commit/js_lint.rb)
 * [Jsl](lib/overcommit/hook/pre_commit/jsl.rb)
 * [JsonSyntax](lib/overcommit/hook/pre_commit/json_syntax.rb)
+* [KtLint](lib/overcommit/hook/pre_commit/kt_lint.rb)
 * [LicenseHeader](lib/overcommit/hook/pre_commit/license_header.rb)
 * [LineEndings](lib/overcommit/hook/pre_commit/line_endings.rb)
 * [LocalPathsInGemfile](lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb)
diff --git a/config/default.yml b/config/default.yml
index e1c444ac..a196c50a 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -424,6 +424,13 @@ PreCommit:
     install_command: 'gem install json'
     include: '**/*.json'
 
+  KtLint:
+    enabled: false
+    description: 'Analyze with KtLint'
+    required_executable: 'ktlint'
+    flags: []
+    include: '**/*.kt'
+
   LicenseFinder:
     enabled: false
     description: 'Analyze with LicenseFinder'
diff --git a/lib/overcommit/hook/pre_commit/kt_lint.rb b/lib/overcommit/hook/pre_commit/kt_lint.rb
new file mode 100644
index 00000000..42f4b387
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/kt_lint.rb
@@ -0,0 +1,17 @@
+module Overcommit::Hook::PreCommit
+  # Runs `ktlint` against modified Kotlin files.
+  # @see https://github.com/shyiko/ktlint
+  class KtLint < Base
+    MESSAGE_REGEX = /((?<file>[^:]+):(?<line>\d+):(\d+):(?<message>.+))/
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n").grep(MESSAGE_REGEX),
+        MESSAGE_REGEX
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/kt_lint_spec.rb b/spec/overcommit/hook/pre_commit/kt_lint_spec.rb
new file mode 100644
index 00000000..2912151f
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/kt_lint_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::KtLint do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.kt file2.kt])
+  end
+
+  context 'when KtLint exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when KtLint exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return([
+          'file1.kt:12:10: error message'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From f135f93275f1be9ca3b9d2dda640302a299f50ac Mon Sep 17 00:00:00 2001
From: Vinicius Lima <vinylimaz@live.com>
Date: Tue, 2 Oct 2018 02:14:13 -0300
Subject: [PATCH 009/223] Add more information to the BundleCheck error msg

---
 lib/overcommit/hook/pre_commit/bundle_check.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/bundle_check.rb b/lib/overcommit/hook/pre_commit/bundle_check.rb
index d2ddd406..6d433da2 100644
--- a/lib/overcommit/hook/pre_commit/bundle_check.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_check.rb
@@ -22,7 +22,8 @@ def run
 
       new_lockfile = File.read(LOCK_FILE) if File.exist?(LOCK_FILE)
       if previous_lockfile != new_lockfile
-        return :fail, "#{LOCK_FILE} is not up-to-date -- run `#{command.join(' ')}`"
+        return :fail, "#{LOCK_FILE} is not up-to-date -- run \
+        `#{command.join(' ')}` or add the Gemfile and/or Gemfile.lock".squeeze
       end
 
       :pass

From b9032b56199f2b9154c8101cf5d60f724fd4d9d7 Mon Sep 17 00:00:00 2001
From: Kevin McCormack <harlemsquirrel@gmail.com>
Date: Sun, 28 Oct 2018 14:45:47 -0400
Subject: [PATCH 010/223] Prepare for frozen string literals

- Add the magic comment to all files
- Update Overcommit::HookContext::PreCommit to not use encode!
- Set Rubocop target Ruby version to 2.3
---
 .rubocop.yml                                     |  2 +-
 Gemfile                                          |  2 ++
 bin/overcommit                                   |  1 +
 lib/overcommit.rb                                |  2 ++
 lib/overcommit/command_splitter.rb               |  2 ++
 lib/overcommit/configuration.rb                  |  2 ++
 lib/overcommit/configuration_validator.rb        | 16 +++++++++-------
 lib/overcommit/constants.rb                      |  6 +++---
 lib/overcommit/exceptions.rb                     |  2 ++
 lib/overcommit/git_config.rb                     |  2 ++
 lib/overcommit/git_repo.rb                       |  2 ++
 lib/overcommit/git_version.rb                    |  2 ++
 lib/overcommit/hook/base.rb                      |  2 ++
 lib/overcommit/hook/commit_msg/base.rb           |  2 ++
 .../hook/commit_msg/capitalized_subject.rb       |  2 ++
 lib/overcommit/hook/commit_msg/empty_message.rb  |  2 ++
 .../hook/commit_msg/gerrit_change_id.rb          |  2 ++
 lib/overcommit/hook/commit_msg/hard_tabs.rb      |  2 ++
 lib/overcommit/hook/commit_msg/message_format.rb |  2 ++
 lib/overcommit/hook/commit_msg/russian_novel.rb  |  2 ++
 .../hook/commit_msg/single_line_subject.rb       |  2 ++
 lib/overcommit/hook/commit_msg/spell_check.rb    |  2 ++
 lib/overcommit/hook/commit_msg/text_width.rb     |  2 ++
 .../hook/commit_msg/trailing_period.rb           |  2 ++
 lib/overcommit/hook/post_checkout/base.rb        |  2 ++
 .../hook/post_checkout/bower_install.rb          |  2 ++
 .../hook/post_checkout/bundle_install.rb         |  2 ++
 .../hook/post_checkout/composer_install.rb       |  2 ++
 lib/overcommit/hook/post_checkout/index_tags.rb  |  2 ++
 lib/overcommit/hook/post_checkout/npm_install.rb |  2 ++
 .../hook/post_checkout/submodule_status.rb       |  2 ++
 .../hook/post_checkout/yarn_install.rb           |  2 ++
 lib/overcommit/hook/post_commit/base.rb          |  2 ++
 lib/overcommit/hook/post_commit/bower_install.rb |  2 ++
 .../hook/post_commit/bundle_install.rb           |  2 ++
 lib/overcommit/hook/post_commit/commitplease.rb  |  2 ++
 .../hook/post_commit/composer_install.rb         |  2 ++
 lib/overcommit/hook/post_commit/git_guilt.rb     |  2 ++
 lib/overcommit/hook/post_commit/index_tags.rb    |  2 ++
 lib/overcommit/hook/post_commit/npm_install.rb   |  2 ++
 .../hook/post_commit/submodule_status.rb         |  2 ++
 lib/overcommit/hook/post_commit/yarn_install.rb  |  2 ++
 lib/overcommit/hook/post_merge/base.rb           |  2 ++
 lib/overcommit/hook/post_merge/bower_install.rb  |  2 ++
 lib/overcommit/hook/post_merge/bundle_install.rb |  2 ++
 .../hook/post_merge/composer_install.rb          |  2 ++
 lib/overcommit/hook/post_merge/index_tags.rb     |  2 ++
 lib/overcommit/hook/post_merge/npm_install.rb    |  2 ++
 .../hook/post_merge/submodule_status.rb          |  2 ++
 lib/overcommit/hook/post_merge/yarn_install.rb   |  2 ++
 lib/overcommit/hook/post_rewrite/base.rb         |  2 ++
 .../hook/post_rewrite/bower_install.rb           |  2 ++
 .../hook/post_rewrite/bundle_install.rb          |  2 ++
 .../hook/post_rewrite/composer_install.rb        |  2 ++
 lib/overcommit/hook/post_rewrite/index_tags.rb   |  2 ++
 lib/overcommit/hook/post_rewrite/npm_install.rb  |  2 ++
 .../hook/post_rewrite/submodule_status.rb        |  2 ++
 lib/overcommit/hook/post_rewrite/yarn_install.rb |  2 ++
 lib/overcommit/hook/pre_commit/author_email.rb   |  2 ++
 lib/overcommit/hook/pre_commit/author_name.rb    |  2 ++
 lib/overcommit/hook/pre_commit/base.rb           |  2 ++
 .../hook/pre_commit/berksfile_check.rb           |  2 +-
 .../hook/pre_commit/broken_symlinks.rb           |  2 ++
 lib/overcommit/hook/pre_commit/bundle_audit.rb   |  4 +++-
 lib/overcommit/hook/pre_commit/bundle_check.rb   |  2 +-
 .../hook/pre_commit/bundle_outdated.rb           |  4 +++-
 lib/overcommit/hook/pre_commit/case_conflicts.rb |  2 ++
 .../hook/pre_commit/chamber_compare.rb           |  2 ++
 .../hook/pre_commit/chamber_security.rb          |  2 ++
 .../hook/pre_commit/chamber_verification.rb      |  2 ++
 lib/overcommit/hook/pre_commit/coffee_lint.rb    |  2 ++
 lib/overcommit/hook/pre_commit/credo.rb          |  2 ++
 lib/overcommit/hook/pre_commit/css_lint.rb       |  2 ++
 lib/overcommit/hook/pre_commit/dogma.rb          |  2 ++
 lib/overcommit/hook/pre_commit/es_lint.rb        |  2 ++
 .../hook/pre_commit/execute_permissions.rb       |  2 ++
 lib/overcommit/hook/pre_commit/fasterer.rb       |  2 ++
 lib/overcommit/hook/pre_commit/fix_me.rb         |  2 ++
 lib/overcommit/hook/pre_commit/flay.rb           |  2 ++
 lib/overcommit/hook/pre_commit/foodcritic.rb     |  2 ++
 .../hook/pre_commit/forbidden_branches.rb        |  2 ++
 lib/overcommit/hook/pre_commit/go_lint.rb        |  2 ++
 lib/overcommit/hook/pre_commit/go_vet.rb         |  2 ++
 lib/overcommit/hook/pre_commit/hadolint.rb       |  2 ++
 lib/overcommit/hook/pre_commit/haml_lint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/hard_tabs.rb      |  2 ++
 lib/overcommit/hook/pre_commit/hlint.rb          |  2 ++
 lib/overcommit/hook/pre_commit/html_hint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/html_tidy.rb      |  2 ++
 lib/overcommit/hook/pre_commit/image_optim.rb    |  2 ++
 .../hook/pre_commit/java_checkstyle.rb           |  2 ++
 lib/overcommit/hook/pre_commit/js_hint.rb        |  2 ++
 lib/overcommit/hook/pre_commit/js_lint.rb        |  2 ++
 lib/overcommit/hook/pre_commit/jscs.rb           |  2 ++
 lib/overcommit/hook/pre_commit/jsl.rb            |  2 ++
 lib/overcommit/hook/pre_commit/json_syntax.rb    |  2 ++
 lib/overcommit/hook/pre_commit/kt_lint.rb        |  2 ++
 lib/overcommit/hook/pre_commit/license_finder.rb |  2 ++
 lib/overcommit/hook/pre_commit/license_header.rb |  2 ++
 lib/overcommit/hook/pre_commit/line_endings.rb   |  2 ++
 .../hook/pre_commit/local_paths_in_gemfile.rb    |  2 ++
 lib/overcommit/hook/pre_commit/mdl.rb            |  2 ++
 .../hook/pre_commit/merge_conflicts.rb           |  2 ++
 lib/overcommit/hook/pre_commit/nginx_test.rb     |  2 ++
 lib/overcommit/hook/pre_commit/pep257.rb         |  2 ++
 lib/overcommit/hook/pre_commit/pep8.rb           |  2 ++
 lib/overcommit/hook/pre_commit/php_cs.rb         |  2 ++
 lib/overcommit/hook/pre_commit/php_cs_fixer.rb   |  2 ++
 lib/overcommit/hook/pre_commit/php_lint.rb       |  2 ++
 lib/overcommit/hook/pre_commit/php_stan.rb       |  2 ++
 lib/overcommit/hook/pre_commit/pronto.rb         |  2 ++
 lib/overcommit/hook/pre_commit/puppet_lint.rb    |  2 ++
 .../hook/pre_commit/puppet_metadata_json_lint.rb |  2 ++
 lib/overcommit/hook/pre_commit/pycodestyle.rb    |  2 ++
 lib/overcommit/hook/pre_commit/pydocstyle.rb     |  2 ++
 lib/overcommit/hook/pre_commit/pyflakes.rb       |  2 ++
 lib/overcommit/hook/pre_commit/pylint.rb         |  2 ++
 lib/overcommit/hook/pre_commit/python_flake8.rb  |  2 ++
 .../hook/pre_commit/rails_best_practices.rb      |  2 ++
 .../hook/pre_commit/rails_schema_up_to_date.rb   |  2 ++
 lib/overcommit/hook/pre_commit/rake_target.rb    |  2 ++
 lib/overcommit/hook/pre_commit/reek.rb           |  2 ++
 lib/overcommit/hook/pre_commit/rst_lint.rb       |  2 ++
 lib/overcommit/hook/pre_commit/rubo_cop.rb       |  2 ++
 lib/overcommit/hook/pre_commit/ruby_lint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/scalariform.rb    |  2 ++
 lib/overcommit/hook/pre_commit/scalastyle.rb     |  2 ++
 lib/overcommit/hook/pre_commit/scss_lint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/semi_standard.rb  |  2 ++
 lib/overcommit/hook/pre_commit/shell_check.rb    |  2 ++
 lib/overcommit/hook/pre_commit/slim_lint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/sqlint.rb         |  2 ++
 lib/overcommit/hook/pre_commit/standard.rb       |  2 ++
 lib/overcommit/hook/pre_commit/stylelint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/swift_lint.rb     |  2 ++
 .../hook/pre_commit/trailing_whitespace.rb       |  2 ++
 lib/overcommit/hook/pre_commit/travis_lint.rb    |  2 ++
 lib/overcommit/hook/pre_commit/ts_lint.rb        |  2 ++
 lib/overcommit/hook/pre_commit/vint.rb           |  2 ++
 lib/overcommit/hook/pre_commit/w3c_css.rb        |  2 ++
 lib/overcommit/hook/pre_commit/w3c_html.rb       |  2 ++
 lib/overcommit/hook/pre_commit/xml_lint.rb       |  2 ++
 lib/overcommit/hook/pre_commit/xml_syntax.rb     |  2 ++
 lib/overcommit/hook/pre_commit/yaml_lint.rb      |  2 ++
 lib/overcommit/hook/pre_commit/yaml_syntax.rb    |  2 ++
 lib/overcommit/hook/pre_commit/yard_coverage.rb  |  2 ++
 lib/overcommit/hook/pre_commit/yarn_check.rb     |  4 ++--
 lib/overcommit/hook/pre_push/base.rb             |  2 ++
 lib/overcommit/hook/pre_push/brakeman.rb         |  2 ++
 lib/overcommit/hook/pre_push/cargo_test.rb       |  2 ++
 lib/overcommit/hook/pre_push/minitest.rb         |  2 ++
 lib/overcommit/hook/pre_push/php_unit.rb         |  2 ++
 .../hook/pre_push/protected_branches.rb          |  2 ++
 lib/overcommit/hook/pre_push/pytest.rb           |  2 ++
 lib/overcommit/hook/pre_push/python_nose.rb      |  2 ++
 lib/overcommit/hook/pre_push/r_spec.rb           |  2 ++
 lib/overcommit/hook/pre_push/rake_target.rb      |  2 ++
 lib/overcommit/hook/pre_push/test_unit.rb        |  2 ++
 lib/overcommit/hook/pre_rebase/base.rb           |  2 ++
 lib/overcommit/hook/pre_rebase/merged_commits.rb |  2 ++
 lib/overcommit/hook/prepare_commit_msg/base.rb   |  2 ++
 .../hook/prepare_commit_msg/replace_branch.rb    |  2 ++
 lib/overcommit/hook/shared/bower_install.rb      |  2 ++
 lib/overcommit/hook/shared/bundle_install.rb     |  2 ++
 lib/overcommit/hook/shared/composer_install.rb   |  2 ++
 lib/overcommit/hook/shared/index_tags.rb         |  2 ++
 lib/overcommit/hook/shared/npm_install.rb        |  2 ++
 lib/overcommit/hook/shared/rake_target.rb        |  2 ++
 lib/overcommit/hook/shared/submodule_status.rb   |  2 ++
 lib/overcommit/hook/shared/yarn_install.rb       |  2 ++
 lib/overcommit/hook_context.rb                   |  2 ++
 lib/overcommit/hook_context/base.rb              |  2 ++
 lib/overcommit/hook_context/commit_msg.rb        |  2 ++
 lib/overcommit/hook_context/post_checkout.rb     |  2 ++
 lib/overcommit/hook_context/post_commit.rb       |  2 ++
 lib/overcommit/hook_context/post_merge.rb        |  2 ++
 lib/overcommit/hook_context/post_rewrite.rb      |  2 ++
 lib/overcommit/hook_context/pre_commit.rb        |  5 ++++-
 lib/overcommit/hook_context/pre_push.rb          |  2 ++
 lib/overcommit/hook_context/pre_rebase.rb        |  2 ++
 .../hook_context/prepare_commit_msg.rb           |  4 +++-
 lib/overcommit/hook_context/run_all.rb           |  2 ++
 lib/overcommit/hook_loader/base.rb               |  2 ++
 .../hook_loader/built_in_hook_loader.rb          |  2 ++
 lib/overcommit/hook_loader/plugin_hook_loader.rb |  2 ++
 lib/overcommit/hook_runner.rb                    |  2 ++
 lib/overcommit/hook_signer.rb                    |  2 ++
 lib/overcommit/installer.rb                      |  2 ++
 lib/overcommit/interrupt_handler.rb              |  2 ++
 lib/overcommit/logger.rb                         |  2 ++
 lib/overcommit/message_processor.rb              | 12 ++++++------
 lib/overcommit/os.rb                             |  2 ++
 lib/overcommit/printer.rb                        |  2 ++
 lib/overcommit/subprocess.rb                     |  2 ++
 lib/overcommit/utils.rb                          |  4 +++-
 lib/overcommit/utils/file_utils.rb               |  2 ++
 lib/overcommit/utils/messages_utils.rb           |  2 ++
 lib/overcommit/version.rb                        |  2 +-
 spec/integration/committing_spec.rb              |  2 ++
 spec/integration/configuration_signing_spec.rb   |  2 ++
 spec/integration/disable_overcommit_spec.rb      |  2 ++
 spec/integration/gemfile_option_spec.rb          |  2 ++
 spec/integration/hook_signing_spec.rb            |  2 ++
 spec/integration/installing_overcommit_spec.rb   |  2 ++
 spec/integration/parallelize_spec.rb             |  2 ++
 spec/integration/protected_branches_spec.rb      |  2 ++
 .../resolving_cherry_pick_conflict_spec.rb       |  2 ++
 .../integration/resolving_merge_conflict_spec.rb |  2 ++
 spec/integration/run_flag_spec.rb                |  2 ++
 spec/integration/template_dir_spec.rb            |  2 ++
 spec/overcommit/cli_spec.rb                      |  2 ++
 spec/overcommit/command_splitter_spec.rb         |  2 ++
 spec/overcommit/configuration_loader_spec.rb     |  2 ++
 spec/overcommit/configuration_spec.rb            |  2 ++
 spec/overcommit/configuration_validator_spec.rb  |  2 ++
 spec/overcommit/default_configuration_spec.rb    |  2 ++
 spec/overcommit/git_config_spec.rb               |  2 ++
 spec/overcommit/git_repo_spec.rb                 |  2 ++
 spec/overcommit/hook/base_spec.rb                |  2 ++
 .../hook/commit_msg/capitalized_subject_spec.rb  |  2 ++
 .../hook/commit_msg/empty_message_spec.rb        |  2 ++
 .../hook/commit_msg/gerrit_change_id_spec.rb     |  2 ++
 .../overcommit/hook/commit_msg/hard_tabs_spec.rb |  2 ++
 .../hook/commit_msg/message_format_spec.rb       |  2 ++
 .../hook/commit_msg/russian_novel_spec.rb        |  2 ++
 .../hook/commit_msg/single_line_subject_spec.rb  |  2 ++
 .../hook/commit_msg/spell_check_spec.rb          |  2 ++
 .../hook/commit_msg/text_width_spec.rb           |  2 ++
 .../hook/commit_msg/trailing_period_spec.rb      |  2 ++
 spec/overcommit/hook/post_checkout/base_spec.rb  |  2 ++
 .../hook/post_checkout/bower_install_spec.rb     |  2 ++
 .../hook/post_checkout/bundle_install_spec.rb    |  2 ++
 .../hook/post_checkout/composer_install_spec.rb  |  2 ++
 .../hook/post_checkout/index_tags_spec.rb        |  2 ++
 .../hook/post_checkout/npm_install_spec.rb       |  2 ++
 .../hook/post_checkout/submodule_status_spec.rb  |  2 ++
 .../hook/post_checkout/yarn_install_spec.rb      |  2 ++
 .../hook/post_commit/bower_install_spec.rb       |  2 ++
 .../hook/post_commit/bundle_install_spec.rb      |  2 ++
 .../hook/post_commit/commitplease_spec.rb        |  2 ++
 .../hook/post_commit/composer_install_spec.rb    |  2 ++
 .../hook/post_commit/git_guilt_spec.rb           |  2 ++
 .../hook/post_commit/index_tags_spec.rb          |  2 ++
 .../hook/post_commit/npm_install_spec.rb         |  2 ++
 .../hook/post_commit/submodule_status_spec.rb    |  2 ++
 .../hook/post_commit/yarn_install_spec.rb        |  2 ++
 .../hook/post_merge/bower_install_spec.rb        |  2 ++
 .../hook/post_merge/bundle_install_spec.rb       |  2 ++
 .../hook/post_merge/composer_install_spec.rb     |  2 ++
 .../hook/post_merge/index_tags_spec.rb           |  2 ++
 .../hook/post_merge/npm_install_spec.rb          |  2 ++
 .../hook/post_merge/submodule_status_spec.rb     |  2 ++
 .../hook/post_merge/yarn_install_spec.rb         |  2 ++
 .../hook/post_rewrite/bower_install_spec.rb      |  2 ++
 .../hook/post_rewrite/bundle_install_spec.rb     |  2 ++
 .../hook/post_rewrite/composer_install_spec.rb   |  2 ++
 .../hook/post_rewrite/index_tags_spec.rb         |  2 ++
 .../hook/post_rewrite/npm_install_spec.rb        |  2 ++
 .../hook/post_rewrite/submodule_status_spec.rb   |  2 ++
 .../hook/post_rewrite/yarn_install_spec.rb       |  2 ++
 .../hook/pre_commit/author_email_spec.rb         |  2 ++
 .../hook/pre_commit/author_name_spec.rb          |  2 ++
 .../hook/pre_commit/berksfile_check_spec.rb      |  2 ++
 .../hook/pre_commit/broken_symlinks_spec.rb      |  2 ++
 .../hook/pre_commit/bundle_audit_spec.rb         |  2 ++
 .../hook/pre_commit/bundle_check_spec.rb         |  2 ++
 .../hook/pre_commit/bundle_outdated_spec.rb      |  2 ++
 .../hook/pre_commit/case_conflicts_spec.rb       |  2 ++
 .../hook/pre_commit/chamber_compare_spec.rb      |  2 ++
 .../hook/pre_commit/chamber_security_spec.rb     |  2 ++
 .../hook/pre_commit/chamber_verification_spec.rb |  2 ++
 .../hook/pre_commit/coffee_lint_spec.rb          |  2 ++
 spec/overcommit/hook/pre_commit/credo_spec.rb    |  2 ++
 spec/overcommit/hook/pre_commit/css_lint_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/dogma_spec.rb    |  2 ++
 spec/overcommit/hook/pre_commit/es_lint_spec.rb  |  2 ++
 .../hook/pre_commit/execute_permissions_spec.rb  |  2 ++
 spec/overcommit/hook/pre_commit/fasterer_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/fix_me_spec.rb   |  2 ++
 spec/overcommit/hook/pre_commit/flay_spec.rb     |  2 ++
 .../hook/pre_commit/foodcritic_spec.rb           |  2 ++
 .../hook/pre_commit/forbidden_branches_spec.rb   |  2 ++
 spec/overcommit/hook/pre_commit/go_lint_spec.rb  |  2 ++
 spec/overcommit/hook/pre_commit/go_vet_spec.rb   |  2 ++
 spec/overcommit/hook/pre_commit/hadolint_spec.rb |  2 ++
 .../overcommit/hook/pre_commit/haml_lint_spec.rb |  2 ++
 .../overcommit/hook/pre_commit/hard_tabs_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/hlint_spec.rb    |  2 ++
 .../overcommit/hook/pre_commit/html_hint_spec.rb |  2 ++
 .../overcommit/hook/pre_commit/html_tidy_spec.rb |  2 ++
 .../hook/pre_commit/image_optim_spec.rb          |  2 ++
 .../hook/pre_commit/java_checkstyle_spec.rb      |  2 ++
 spec/overcommit/hook/pre_commit/js_hint_spec.rb  |  2 ++
 spec/overcommit/hook/pre_commit/js_lint_spec.rb  |  2 ++
 spec/overcommit/hook/pre_commit/jscs_spec.rb     |  2 ++
 spec/overcommit/hook/pre_commit/jsl_spec.rb      |  2 ++
 .../hook/pre_commit/json_syntax_spec.rb          |  2 ++
 spec/overcommit/hook/pre_commit/kt_lint_spec.rb  |  2 ++
 .../hook/pre_commit/license_finder_spec.rb       |  2 ++
 .../hook/pre_commit/license_header_spec.rb       |  2 ++
 .../hook/pre_commit/line_endings_spec.rb         |  2 ++
 .../pre_commit/local_paths_in_gemfile_spec.rb    |  2 ++
 spec/overcommit/hook/pre_commit/mdl_spec.rb      |  2 ++
 .../hook/pre_commit/merge_conflicts_spec.rb      |  2 ++
 .../hook/pre_commit/nginx_test_spec.rb           |  2 ++
 spec/overcommit/hook/pre_commit/pep257_spec.rb   |  2 ++
 spec/overcommit/hook/pre_commit/pep8_spec.rb     |  2 ++
 spec/overcommit/hook/pre_commit/php_lint_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/php_stan_spec.rb |  2 ++
 .../hook/pre_commit/phpcs_fixer_spec.rb          |  2 ++
 spec/overcommit/hook/pre_commit/phpcs_spec.rb    |  2 ++
 spec/overcommit/hook/pre_commit/pronto_spec.rb   |  2 ++
 .../hook/pre_commit/puppet_lint_spec.rb          |  2 ++
 .../pre_commit/puppet_metadata_json_lint_spec.rb |  2 ++
 .../hook/pre_commit/pycodestyle_spec.rb          |  2 ++
 .../hook/pre_commit/pydocstyle_spec.rb           |  2 ++
 spec/overcommit/hook/pre_commit/pyflakes_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/pylint_spec.rb   |  2 ++
 .../hook/pre_commit/python_flake8_spec.rb        |  2 ++
 .../hook/pre_commit/rails_best_practices_spec.rb |  2 ++
 .../pre_commit/rails_schema_up_to_date_spec.rb   |  2 ++
 .../hook/pre_commit/rake_target_spec.rb          |  2 ++
 spec/overcommit/hook/pre_commit/reek_spec.rb     |  2 ++
 spec/overcommit/hook/pre_commit/rst_lint_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/rubo_cop_spec.rb |  2 ++
 .../overcommit/hook/pre_commit/ruby_lint_spec.rb |  2 ++
 .../hook/pre_commit/scalariform_spec.rb          |  2 ++
 .../hook/pre_commit/scalastyle_spec.rb           |  2 ++
 .../overcommit/hook/pre_commit/scss_lint_spec.rb |  2 ++
 .../hook/pre_commit/semi_standard_spec.rb        |  2 ++
 .../hook/pre_commit/shell_check_spec.rb          |  2 ++
 .../overcommit/hook/pre_commit/slim_lint_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/sqlint_spec.rb   |  2 ++
 spec/overcommit/hook/pre_commit/standard_spec.rb |  2 ++
 .../overcommit/hook/pre_commit/stylelint_spec.rb |  2 ++
 .../hook/pre_commit/swift_lint_spec.rb           |  2 ++
 .../hook/pre_commit/trailing_whitespace_spec.rb  |  2 ++
 .../hook/pre_commit/travis_lint_spec.rb          |  2 ++
 spec/overcommit/hook/pre_commit/ts_lint_spec.rb  |  2 ++
 spec/overcommit/hook/pre_commit/vint_spec.rb     |  2 ++
 spec/overcommit/hook/pre_commit/w3c_css_spec.rb  |  2 ++
 spec/overcommit/hook/pre_commit/w3c_html_spec.rb |  2 ++
 spec/overcommit/hook/pre_commit/xml_lint_spec.rb |  2 ++
 .../hook/pre_commit/xml_syntax_spec.rb           |  2 ++
 .../overcommit/hook/pre_commit/yaml_lint_spec.rb |  2 ++
 .../hook/pre_commit/yaml_syntax_spec.rb          |  2 ++
 .../hook/pre_commit/yard_coverage_spec.rb        |  2 ++
 .../hook/pre_commit/yarn_check_spec.rb           |  2 ++
 spec/overcommit/hook/pre_push/brakeman_spec.rb   |  2 ++
 spec/overcommit/hook/pre_push/cargo_test_spec.rb |  2 ++
 spec/overcommit/hook/pre_push/minitest_spec.rb   |  2 ++
 spec/overcommit/hook/pre_push/php_unit_spec.rb   |  2 ++
 .../hook/pre_push/protected_branches_spec.rb     |  2 ++
 spec/overcommit/hook/pre_push/pytest_spec.rb     |  2 ++
 .../overcommit/hook/pre_push/python_nose_spec.rb |  2 ++
 spec/overcommit/hook/pre_push/r_spec_spec.rb     |  2 ++
 .../overcommit/hook/pre_push/rake_target_spec.rb |  2 ++
 spec/overcommit/hook/pre_push/test_unit_spec.rb  |  2 ++
 .../hook/pre_rebase/merged_commits_spec.rb       |  2 ++
 .../hook/prepare_commit_msg/base_spec.rb         |  2 ++
 .../prepare_commit_msg/replace_branch_spec.rb    |  2 ++
 spec/overcommit/hook_context/base_spec.rb        |  2 ++
 spec/overcommit/hook_context/commit_msg_spec.rb  |  2 ++
 .../hook_context/post_checkout_spec.rb           |  2 ++
 spec/overcommit/hook_context/post_commit_spec.rb |  2 ++
 spec/overcommit/hook_context/post_merge_spec.rb  |  2 ++
 .../overcommit/hook_context/post_rewrite_spec.rb |  2 ++
 spec/overcommit/hook_context/pre_commit_spec.rb  |  2 ++
 spec/overcommit/hook_context/pre_push_spec.rb    |  2 ++
 spec/overcommit/hook_context/pre_rebase_spec.rb  |  2 ++
 .../hook_context/prepare_commit_msg_spec.rb      |  2 ++
 spec/overcommit/hook_context/run_all_spec.rb     |  2 ++
 spec/overcommit/hook_signer_spec.rb              |  2 ++
 spec/overcommit/installer_spec.rb                |  2 ++
 spec/overcommit/logger_spec.rb                   |  2 ++
 spec/overcommit/message_processor_spec.rb        |  2 ++
 spec/overcommit/utils_spec.rb                    |  2 ++
 spec/spec_helper.rb                              |  2 ++
 spec/support/git_spec_helpers.rb                 |  2 ++
 spec/support/matchers/hook.rb                    |  2 ++
 spec/support/normalize_indent.rb                 |  2 ++
 spec/support/output_helpers.rb                   |  2 ++
 spec/support/shell_helpers.rb                    |  2 ++
 template-dir/hooks/commit-msg                    |  1 +
 template-dir/hooks/overcommit-hook               |  1 +
 template-dir/hooks/post-checkout                 |  1 +
 template-dir/hooks/post-commit                   |  1 +
 template-dir/hooks/post-merge                    |  1 +
 template-dir/hooks/post-rewrite                  |  1 +
 template-dir/hooks/pre-commit                    |  1 +
 template-dir/hooks/pre-push                      |  1 +
 template-dir/hooks/pre-rebase                    |  1 +
 template-dir/hooks/prepare-commit-msg            |  1 +
 393 files changed, 789 insertions(+), 27 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1d95f9d4..bdc196db 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 Layout/ClosingParenthesisIndentation:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index 57103c0d..375c88db 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
diff --git a/bin/overcommit b/bin/overcommit
index f933787a..ebcf56a4 100755
--- a/bin/overcommit
+++ b/bin/overcommit
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
diff --git a/lib/overcommit.rb b/lib/overcommit.rb
index b97d257d..15fef94f 100644
--- a/lib/overcommit.rb
+++ b/lib/overcommit.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/os'
 require 'overcommit/constants'
 require 'overcommit/exceptions'
diff --git a/lib/overcommit/command_splitter.rb b/lib/overcommit/command_splitter.rb
index 3b40ff34..32c5299c 100644
--- a/lib/overcommit/command_splitter.rb
+++ b/lib/overcommit/command_splitter.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Distributes a list of arguments over multiple invocations of a command.
   #
diff --git a/lib/overcommit/configuration.rb b/lib/overcommit/configuration.rb
index 25dba1cf..9e0716d1 100644
--- a/lib/overcommit/configuration.rb
+++ b/lib/overcommit/configuration.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 require 'json'
 
diff --git a/lib/overcommit/configuration_validator.rb b/lib/overcommit/configuration_validator.rb
index 800893e2..77357c05 100644
--- a/lib/overcommit/configuration_validator.rb
+++ b/lib/overcommit/configuration_validator.rb
@@ -1,4 +1,6 @@
-# rubocop:disable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/LineLength
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ClassLength, Metrics/MethodLength, Metrics/LineLength
 module Overcommit
   # Validates and normalizes a configuration.
   class ConfigurationValidator
@@ -82,8 +84,8 @@ def check_hook_env(hash)
       end
 
       if errors.any?
-        @log.error errors.join("\n") if @log
-        @log.newline if @log
+        @log&.error errors.join("\n")
+        @log&.newline
         raise Overcommit::Exceptions::ConfigurationError,
               'One or more hooks had an invalid `env` configuration option'
       end
@@ -107,8 +109,8 @@ def check_hook_name_format(hash)
       end
 
       if errors.any?
-        @log.error errors.join("\n") if @log
-        @log.newline if @log
+        @log&.error errors.join("\n")
+        @log&.newline
         raise Overcommit::Exceptions::ConfigurationError,
               'One or more hooks had invalid names'
       end
@@ -154,8 +156,8 @@ def check_for_too_many_processors(config, hash)
       end
 
       if errors.any?
-        @log.error errors.join("\n") if @log
-        @log.newline if @log
+        @log&.error errors.join("\n")
+        @log&.newline
         raise Overcommit::Exceptions::ConfigurationError,
               'One or more hooks had invalid `processor` value configured'
       end
diff --git a/lib/overcommit/constants.rb b/lib/overcommit/constants.rb
index ff2c9311..69ba6658 100644
--- a/lib/overcommit/constants.rb
+++ b/lib/overcommit/constants.rb
@@ -3,10 +3,10 @@
 # Global application constants.
 module Overcommit
   HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
-  CONFIG_FILE_NAME = '.overcommit.yml'.freeze
+  CONFIG_FILE_NAME = '.overcommit.yml'
 
   HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 
-  REPO_URL = 'https://github.com/brigade/overcommit'.freeze
-  BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
+  REPO_URL = 'https://github.com/brigade/overcommit'
+  BUG_REPORT_URL = "#{REPO_URL}/issues"
 end
diff --git a/lib/overcommit/exceptions.rb b/lib/overcommit/exceptions.rb
index 14d4622d..3246c567 100644
--- a/lib/overcommit/exceptions.rb
+++ b/lib/overcommit/exceptions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Exceptions
   # Raised when a {Configuration} could not be loaded from a file.
   class ConfigurationError < StandardError; end
diff --git a/lib/overcommit/git_config.rb b/lib/overcommit/git_config.rb
index 71be91dc..d2ad2ad6 100644
--- a/lib/overcommit/git_config.rb
+++ b/lib/overcommit/git_config.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/utils'
 
 module Overcommit
diff --git a/lib/overcommit/git_repo.rb b/lib/overcommit/git_repo.rb
index 0ed6d3de..54572507 100644
--- a/lib/overcommit/git_repo.rb
+++ b/lib/overcommit/git_repo.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'iniparse'
 
 module Overcommit
diff --git a/lib/overcommit/git_version.rb b/lib/overcommit/git_version.rb
index ab5021ac..ac4044c3 100644
--- a/lib/overcommit/git_version.rb
+++ b/lib/overcommit/git_version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Returns the version of the available git binary.
 #
 # This is intended to be used to conveniently execute code based on a specific
diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index b1607c08..b24e7e50 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'overcommit/message_processor'
 
diff --git a/lib/overcommit/hook/commit_msg/base.rb b/lib/overcommit/hook/commit_msg/base.rb
index 24241640..2b46a66e 100644
--- a/lib/overcommit/hook/commit_msg/base.rb
+++ b/lib/overcommit/hook/commit_msg/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::CommitMsg
diff --git a/lib/overcommit/hook/commit_msg/capitalized_subject.rb b/lib/overcommit/hook/commit_msg/capitalized_subject.rb
index 081bafcc..1b783bc1 100644
--- a/lib/overcommit/hook/commit_msg/capitalized_subject.rb
+++ b/lib/overcommit/hook/commit_msg/capitalized_subject.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Ensures commit message subject lines start with a capital letter.
   class CapitalizedSubject < Base
diff --git a/lib/overcommit/hook/commit_msg/empty_message.rb b/lib/overcommit/hook/commit_msg/empty_message.rb
index b0cd0310..a0f3bfc7 100644
--- a/lib/overcommit/hook/commit_msg/empty_message.rb
+++ b/lib/overcommit/hook/commit_msg/empty_message.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Checks that the commit message is not empty
   class EmptyMessage < Base
diff --git a/lib/overcommit/hook/commit_msg/gerrit_change_id.rb b/lib/overcommit/hook/commit_msg/gerrit_change_id.rb
index 567b6c0b..f8514849 100644
--- a/lib/overcommit/hook/commit_msg/gerrit_change_id.rb
+++ b/lib/overcommit/hook/commit_msg/gerrit_change_id.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Ensures a Gerrit Change-Id line is included in the commit message.
   #
diff --git a/lib/overcommit/hook/commit_msg/hard_tabs.rb b/lib/overcommit/hook/commit_msg/hard_tabs.rb
index dcd0356e..e8ff5aeb 100644
--- a/lib/overcommit/hook/commit_msg/hard_tabs.rb
+++ b/lib/overcommit/hook/commit_msg/hard_tabs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Checks for hard tabs in commit messages.
   class HardTabs < Base
diff --git a/lib/overcommit/hook/commit_msg/message_format.rb b/lib/overcommit/hook/commit_msg/message_format.rb
index dc70e25f..dda9fd9d 100644
--- a/lib/overcommit/hook/commit_msg/message_format.rb
+++ b/lib/overcommit/hook/commit_msg/message_format.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Ensures the commit message follows a specific format.
   class MessageFormat < Base
diff --git a/lib/overcommit/hook/commit_msg/russian_novel.rb b/lib/overcommit/hook/commit_msg/russian_novel.rb
index 35c89402..26ec7ff5 100644
--- a/lib/overcommit/hook/commit_msg/russian_novel.rb
+++ b/lib/overcommit/hook/commit_msg/russian_novel.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Checks for long commit messages (not good or bad--just fun to point out)
   class RussianNovel < Base
diff --git a/lib/overcommit/hook/commit_msg/single_line_subject.rb b/lib/overcommit/hook/commit_msg/single_line_subject.rb
index 8e939536..e374d541 100644
--- a/lib/overcommit/hook/commit_msg/single_line_subject.rb
+++ b/lib/overcommit/hook/commit_msg/single_line_subject.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Ensures commit message subject lines are followed by a blank line.
   class SingleLineSubject < Base
diff --git a/lib/overcommit/hook/commit_msg/spell_check.rb b/lib/overcommit/hook/commit_msg/spell_check.rb
index e021c766..241df378 100644
--- a/lib/overcommit/hook/commit_msg/spell_check.rb
+++ b/lib/overcommit/hook/commit_msg/spell_check.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 
 module Overcommit::Hook::CommitMsg
diff --git a/lib/overcommit/hook/commit_msg/text_width.rb b/lib/overcommit/hook/commit_msg/text_width.rb
index d057c8cc..011e7e2a 100644
--- a/lib/overcommit/hook/commit_msg/text_width.rb
+++ b/lib/overcommit/hook/commit_msg/text_width.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Ensures the number of columns the subject and commit message lines occupy is
   # under the preferred limits.
diff --git a/lib/overcommit/hook/commit_msg/trailing_period.rb b/lib/overcommit/hook/commit_msg/trailing_period.rb
index ea8725b8..d3c8b276 100644
--- a/lib/overcommit/hook/commit_msg/trailing_period.rb
+++ b/lib/overcommit/hook/commit_msg/trailing_period.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::CommitMsg
   # Ensures commit message subject lines do not have a trailing period
   class TrailingPeriod < Base
diff --git a/lib/overcommit/hook/post_checkout/base.rb b/lib/overcommit/hook/post_checkout/base.rb
index d83bb357..842e3154 100644
--- a/lib/overcommit/hook/post_checkout/base.rb
+++ b/lib/overcommit/hook/post_checkout/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/bower_install.rb b/lib/overcommit/hook/post_checkout/bower_install.rb
index cc93e074..2eed8bba 100644
--- a/lib/overcommit/hook/post_checkout/bower_install.rb
+++ b/lib/overcommit/hook/post_checkout/bower_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bower_install'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/bundle_install.rb b/lib/overcommit/hook/post_checkout/bundle_install.rb
index f6cfde78..880b3d89 100644
--- a/lib/overcommit/hook/post_checkout/bundle_install.rb
+++ b/lib/overcommit/hook/post_checkout/bundle_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bundle_install'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/composer_install.rb b/lib/overcommit/hook/post_checkout/composer_install.rb
index 28573343..f6449500 100644
--- a/lib/overcommit/hook/post_checkout/composer_install.rb
+++ b/lib/overcommit/hook/post_checkout/composer_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/composer_install'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/index_tags.rb b/lib/overcommit/hook/post_checkout/index_tags.rb
index 5d7784b7..2a42821d 100644
--- a/lib/overcommit/hook/post_checkout/index_tags.rb
+++ b/lib/overcommit/hook/post_checkout/index_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/npm_install.rb b/lib/overcommit/hook/post_checkout/npm_install.rb
index e726469f..6f2c1a1b 100644
--- a/lib/overcommit/hook/post_checkout/npm_install.rb
+++ b/lib/overcommit/hook/post_checkout/npm_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/npm_install'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/submodule_status.rb b/lib/overcommit/hook/post_checkout/submodule_status.rb
index 59f16a73..139301fb 100644
--- a/lib/overcommit/hook/post_checkout/submodule_status.rb
+++ b/lib/overcommit/hook/post_checkout/submodule_status.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/submodule_status'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_checkout/yarn_install.rb b/lib/overcommit/hook/post_checkout/yarn_install.rb
index 48087612..4d876c92 100644
--- a/lib/overcommit/hook/post_checkout/yarn_install.rb
+++ b/lib/overcommit/hook/post_checkout/yarn_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/yarn_install'
 
 module Overcommit::Hook::PostCheckout
diff --git a/lib/overcommit/hook/post_commit/base.rb b/lib/overcommit/hook/post_commit/base.rb
index 3d22c91c..9acd77d3 100644
--- a/lib/overcommit/hook/post_commit/base.rb
+++ b/lib/overcommit/hook/post_commit/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/bower_install.rb b/lib/overcommit/hook/post_commit/bower_install.rb
index 72cc1cbc..71a691fa 100644
--- a/lib/overcommit/hook/post_commit/bower_install.rb
+++ b/lib/overcommit/hook/post_commit/bower_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bower_install'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/bundle_install.rb b/lib/overcommit/hook/post_commit/bundle_install.rb
index 3505023e..dbb18267 100644
--- a/lib/overcommit/hook/post_commit/bundle_install.rb
+++ b/lib/overcommit/hook/post_commit/bundle_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bundle_install'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/commitplease.rb b/lib/overcommit/hook/post_commit/commitplease.rb
index ccc404f6..3674dc12 100644
--- a/lib/overcommit/hook/post_commit/commitplease.rb
+++ b/lib/overcommit/hook/post_commit/commitplease.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PostCommit
   # Check that a commit message conforms to a certain style
   #
diff --git a/lib/overcommit/hook/post_commit/composer_install.rb b/lib/overcommit/hook/post_commit/composer_install.rb
index 218c8140..6ae4f704 100644
--- a/lib/overcommit/hook/post_commit/composer_install.rb
+++ b/lib/overcommit/hook/post_commit/composer_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/composer_install'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/git_guilt.rb b/lib/overcommit/hook/post_commit/git_guilt.rb
index 874f925c..41980425 100644
--- a/lib/overcommit/hook/post_commit/git_guilt.rb
+++ b/lib/overcommit/hook/post_commit/git_guilt.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PostCommit
   # Calculates the change in blame since the last revision.
   #
diff --git a/lib/overcommit/hook/post_commit/index_tags.rb b/lib/overcommit/hook/post_commit/index_tags.rb
index 802411cd..89cc4784 100644
--- a/lib/overcommit/hook/post_commit/index_tags.rb
+++ b/lib/overcommit/hook/post_commit/index_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/npm_install.rb b/lib/overcommit/hook/post_commit/npm_install.rb
index 9fd61461..cc5b0fed 100644
--- a/lib/overcommit/hook/post_commit/npm_install.rb
+++ b/lib/overcommit/hook/post_commit/npm_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/npm_install'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/submodule_status.rb b/lib/overcommit/hook/post_commit/submodule_status.rb
index 5921a19f..7cb313dd 100644
--- a/lib/overcommit/hook/post_commit/submodule_status.rb
+++ b/lib/overcommit/hook/post_commit/submodule_status.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/submodule_status'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_commit/yarn_install.rb b/lib/overcommit/hook/post_commit/yarn_install.rb
index 184277f5..5525d933 100644
--- a/lib/overcommit/hook/post_commit/yarn_install.rb
+++ b/lib/overcommit/hook/post_commit/yarn_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/yarn_install'
 
 module Overcommit::Hook::PostCommit
diff --git a/lib/overcommit/hook/post_merge/base.rb b/lib/overcommit/hook/post_merge/base.rb
index 32cc2638..e4d3620f 100644
--- a/lib/overcommit/hook/post_merge/base.rb
+++ b/lib/overcommit/hook/post_merge/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/bower_install.rb b/lib/overcommit/hook/post_merge/bower_install.rb
index 07d9b601..defd1d2e 100644
--- a/lib/overcommit/hook/post_merge/bower_install.rb
+++ b/lib/overcommit/hook/post_merge/bower_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bower_install'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/bundle_install.rb b/lib/overcommit/hook/post_merge/bundle_install.rb
index 5557428b..df6ab67a 100644
--- a/lib/overcommit/hook/post_merge/bundle_install.rb
+++ b/lib/overcommit/hook/post_merge/bundle_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bundle_install'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/composer_install.rb b/lib/overcommit/hook/post_merge/composer_install.rb
index ec17a5a8..841353eb 100644
--- a/lib/overcommit/hook/post_merge/composer_install.rb
+++ b/lib/overcommit/hook/post_merge/composer_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/composer_install'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/index_tags.rb b/lib/overcommit/hook/post_merge/index_tags.rb
index 19133336..76ec3d57 100644
--- a/lib/overcommit/hook/post_merge/index_tags.rb
+++ b/lib/overcommit/hook/post_merge/index_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/npm_install.rb b/lib/overcommit/hook/post_merge/npm_install.rb
index 72420ec5..e016b40e 100644
--- a/lib/overcommit/hook/post_merge/npm_install.rb
+++ b/lib/overcommit/hook/post_merge/npm_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/npm_install'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/submodule_status.rb b/lib/overcommit/hook/post_merge/submodule_status.rb
index d33bef71..beced8f1 100644
--- a/lib/overcommit/hook/post_merge/submodule_status.rb
+++ b/lib/overcommit/hook/post_merge/submodule_status.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/submodule_status'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_merge/yarn_install.rb b/lib/overcommit/hook/post_merge/yarn_install.rb
index 39d5c33b..1ba4c0d9 100644
--- a/lib/overcommit/hook/post_merge/yarn_install.rb
+++ b/lib/overcommit/hook/post_merge/yarn_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/yarn_install'
 
 module Overcommit::Hook::PostMerge
diff --git a/lib/overcommit/hook/post_rewrite/base.rb b/lib/overcommit/hook/post_rewrite/base.rb
index 9dfcaf27..39f4fb6f 100644
--- a/lib/overcommit/hook/post_rewrite/base.rb
+++ b/lib/overcommit/hook/post_rewrite/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/bower_install.rb b/lib/overcommit/hook/post_rewrite/bower_install.rb
index c755aae1..558c3f70 100644
--- a/lib/overcommit/hook/post_rewrite/bower_install.rb
+++ b/lib/overcommit/hook/post_rewrite/bower_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bower_install'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/bundle_install.rb b/lib/overcommit/hook/post_rewrite/bundle_install.rb
index d3ae92e1..17c94570 100644
--- a/lib/overcommit/hook/post_rewrite/bundle_install.rb
+++ b/lib/overcommit/hook/post_rewrite/bundle_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/bundle_install'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/composer_install.rb b/lib/overcommit/hook/post_rewrite/composer_install.rb
index 354d6e50..11bd7c2f 100644
--- a/lib/overcommit/hook/post_rewrite/composer_install.rb
+++ b/lib/overcommit/hook/post_rewrite/composer_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/composer_install'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/index_tags.rb b/lib/overcommit/hook/post_rewrite/index_tags.rb
index 51c4a558..cd117c19 100644
--- a/lib/overcommit/hook/post_rewrite/index_tags.rb
+++ b/lib/overcommit/hook/post_rewrite/index_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/index_tags'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/npm_install.rb b/lib/overcommit/hook/post_rewrite/npm_install.rb
index 382ace9d..b7d408ac 100644
--- a/lib/overcommit/hook/post_rewrite/npm_install.rb
+++ b/lib/overcommit/hook/post_rewrite/npm_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/npm_install'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/submodule_status.rb b/lib/overcommit/hook/post_rewrite/submodule_status.rb
index 06c77b24..7fd25b7a 100644
--- a/lib/overcommit/hook/post_rewrite/submodule_status.rb
+++ b/lib/overcommit/hook/post_rewrite/submodule_status.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/submodule_status'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/post_rewrite/yarn_install.rb b/lib/overcommit/hook/post_rewrite/yarn_install.rb
index 37c61ded..40807bba 100644
--- a/lib/overcommit/hook/post_rewrite/yarn_install.rb
+++ b/lib/overcommit/hook/post_rewrite/yarn_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/yarn_install'
 
 module Overcommit::Hook::PostRewrite
diff --git a/lib/overcommit/hook/pre_commit/author_email.rb b/lib/overcommit/hook/pre_commit/author_email.rb
index e5aca1b1..7792cea4 100644
--- a/lib/overcommit/hook/pre_commit/author_email.rb
+++ b/lib/overcommit/hook/pre_commit/author_email.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks the format of an author's email address.
   class AuthorEmail < Base
diff --git a/lib/overcommit/hook/pre_commit/author_name.rb b/lib/overcommit/hook/pre_commit/author_name.rb
index 79f899f5..63d4243a 100644
--- a/lib/overcommit/hook/pre_commit/author_name.rb
+++ b/lib/overcommit/hook/pre_commit/author_name.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Ensures that a commit author has a name with at least first and last names.
   class AuthorName < Base
diff --git a/lib/overcommit/hook/pre_commit/base.rb b/lib/overcommit/hook/pre_commit/base.rb
index e1a7b3d5..4e944db5 100644
--- a/lib/overcommit/hook/pre_commit/base.rb
+++ b/lib/overcommit/hook/pre_commit/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'overcommit/utils/messages_utils'
 
diff --git a/lib/overcommit/hook/pre_commit/berksfile_check.rb b/lib/overcommit/hook/pre_commit/berksfile_check.rb
index 80049e2d..a8040976 100644
--- a/lib/overcommit/hook/pre_commit/berksfile_check.rb
+++ b/lib/overcommit/hook/pre_commit/berksfile_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://berkshelf.com/
   class BerksfileCheck < Base
-    LOCK_FILE = 'Berksfile.lock'.freeze
+    LOCK_FILE = 'Berksfile.lock'
 
     def run
       # Ignore if Berksfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/broken_symlinks.rb b/lib/overcommit/hook/pre_commit/broken_symlinks.rb
index c2a62c8e..50dbbee2 100644
--- a/lib/overcommit/hook/pre_commit/broken_symlinks.rb
+++ b/lib/overcommit/hook/pre_commit/broken_symlinks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for broken symlinks.
   class BrokenSymlinks < Base
diff --git a/lib/overcommit/hook/pre_commit/bundle_audit.rb b/lib/overcommit/hook/pre_commit/bundle_audit.rb
index 2840a536..465cc3c8 100644
--- a/lib/overcommit/hook/pre_commit/bundle_audit.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_audit.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for vulnerable versions of gems in Gemfile.lock.
   #
   # @see https://github.com/rubysec/bundler-audit
   class BundleAudit < Base
-    LOCK_FILE = 'Gemfile.lock'.freeze
+    LOCK_FILE = 'Gemfile.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_check.rb b/lib/overcommit/hook/pre_commit/bundle_check.rb
index 6d433da2..10d30d2c 100644
--- a/lib/overcommit/hook/pre_commit/bundle_check.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/
   class BundleCheck < Base
-    LOCK_FILE = 'Gemfile.lock'.freeze
+    LOCK_FILE = 'Gemfile.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_outdated.rb b/lib/overcommit/hook/pre_commit/bundle_outdated.rb
index 576430ce..afa36c23 100644
--- a/lib/overcommit/hook/pre_commit/bundle_outdated.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_outdated.rb
@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Check if any gems in Gemfile.lock have newer versions, unless the
   # Gemfile.lock is ignored by Git.
   #
   # @see http://bundler.io/bundle_outdated.html
   class BundleOutdated < Base
-    LOCK_FILE = 'Gemfile.lock'.freeze
+    LOCK_FILE = 'Gemfile.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/case_conflicts.rb b/lib/overcommit/hook/pre_commit/case_conflicts.rb
index 84e7af95..ee6e4161 100644
--- a/lib/overcommit/hook/pre_commit/case_conflicts.rb
+++ b/lib/overcommit/hook/pre_commit/case_conflicts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for files that would conflict in case-insensitive filesystems
   # Adapted from https://github.com/pre-commit/pre-commit-hooks
diff --git a/lib/overcommit/hook/pre_commit/chamber_compare.rb b/lib/overcommit/hook/pre_commit/chamber_compare.rb
index b5e5791e..f0c4f146 100644
--- a/lib/overcommit/hook/pre_commit/chamber_compare.rb
+++ b/lib/overcommit/hook/pre_commit/chamber_compare.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `chamber compare` against a configurable set of namespaces.
   #
diff --git a/lib/overcommit/hook/pre_commit/chamber_security.rb b/lib/overcommit/hook/pre_commit/chamber_security.rb
index b70148b3..b47672df 100644
--- a/lib/overcommit/hook/pre_commit/chamber_security.rb
+++ b/lib/overcommit/hook/pre_commit/chamber_security.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `chamber secure` against any modified Chamber settings files.
   #
diff --git a/lib/overcommit/hook/pre_commit/chamber_verification.rb b/lib/overcommit/hook/pre_commit/chamber_verification.rb
index 457439ad..3114b632 100644
--- a/lib/overcommit/hook/pre_commit/chamber_verification.rb
+++ b/lib/overcommit/hook/pre_commit/chamber_verification.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `chamber sign --verify`.
   #
diff --git a/lib/overcommit/hook/pre_commit/coffee_lint.rb b/lib/overcommit/hook/pre_commit/coffee_lint.rb
index d8057ff6..7e68b40d 100644
--- a/lib/overcommit/hook/pre_commit/coffee_lint.rb
+++ b/lib/overcommit/hook/pre_commit/coffee_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `coffeelint` against any modified CoffeeScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/credo.rb b/lib/overcommit/hook/pre_commit/credo.rb
index 62192fda..b6d4143f 100644
--- a/lib/overcommit/hook/pre_commit/credo.rb
+++ b/lib/overcommit/hook/pre_commit/credo.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `credo` against any modified ex files.
   #
diff --git a/lib/overcommit/hook/pre_commit/css_lint.rb b/lib/overcommit/hook/pre_commit/css_lint.rb
index 27ffd7eb..7ca82283 100644
--- a/lib/overcommit/hook/pre_commit/css_lint.rb
+++ b/lib/overcommit/hook/pre_commit/css_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `csslint` against any modified CSS files.
   #
diff --git a/lib/overcommit/hook/pre_commit/dogma.rb b/lib/overcommit/hook/pre_commit/dogma.rb
index e9c217fb..744553a2 100644
--- a/lib/overcommit/hook/pre_commit/dogma.rb
+++ b/lib/overcommit/hook/pre_commit/dogma.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `dogma` against any modified ex files.
   #
diff --git a/lib/overcommit/hook/pre_commit/es_lint.rb b/lib/overcommit/hook/pre_commit/es_lint.rb
index 71c71b9f..ebbdd112 100644
--- a/lib/overcommit/hook/pre_commit/es_lint.rb
+++ b/lib/overcommit/hook/pre_commit/es_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `eslint` against any modified JavaScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/execute_permissions.rb b/lib/overcommit/hook/pre_commit/execute_permissions.rb
index b94d4392..ae4cabd9 100644
--- a/lib/overcommit/hook/pre_commit/execute_permissions.rb
+++ b/lib/overcommit/hook/pre_commit/execute_permissions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for files with execute permissions, which are usually not necessary
   # in source code files (and are typically caused by a misconfigured editor
diff --git a/lib/overcommit/hook/pre_commit/fasterer.rb b/lib/overcommit/hook/pre_commit/fasterer.rb
index bdc7981a..dc584368 100644
--- a/lib/overcommit/hook/pre_commit/fasterer.rb
+++ b/lib/overcommit/hook/pre_commit/fasterer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `fasterer` against any modified Ruby files.
   #
diff --git a/lib/overcommit/hook/pre_commit/fix_me.rb b/lib/overcommit/hook/pre_commit/fix_me.rb
index 311afd10..81dad3f9 100644
--- a/lib/overcommit/hook/pre_commit/fix_me.rb
+++ b/lib/overcommit/hook/pre_commit/fix_me.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Check for "token" strings
   class FixMe < Base
diff --git a/lib/overcommit/hook/pre_commit/flay.rb b/lib/overcommit/hook/pre_commit/flay.rb
index c30ee76b..9876739a 100644
--- a/lib/overcommit/hook/pre_commit/flay.rb
+++ b/lib/overcommit/hook/pre_commit/flay.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `flay` against any modified files.
   #
diff --git a/lib/overcommit/hook/pre_commit/foodcritic.rb b/lib/overcommit/hook/pre_commit/foodcritic.rb
index a9091a26..98ac9873 100644
--- a/lib/overcommit/hook/pre_commit/foodcritic.rb
+++ b/lib/overcommit/hook/pre_commit/foodcritic.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `foodcritic` against any modified Ruby files from Chef directory structure.
   #
diff --git a/lib/overcommit/hook/pre_commit/forbidden_branches.rb b/lib/overcommit/hook/pre_commit/forbidden_branches.rb
index cb907da1..6969742f 100644
--- a/lib/overcommit/hook/pre_commit/forbidden_branches.rb
+++ b/lib/overcommit/hook/pre_commit/forbidden_branches.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Prevents commits to branches matching one of the configured patterns.
   class ForbiddenBranches < Base
diff --git a/lib/overcommit/hook/pre_commit/go_lint.rb b/lib/overcommit/hook/pre_commit/go_lint.rb
index 3e0dfc3c..c610edb4 100644
--- a/lib/overcommit/hook/pre_commit/go_lint.rb
+++ b/lib/overcommit/hook/pre_commit/go_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `golint` against any modified Golang files.
   #
diff --git a/lib/overcommit/hook/pre_commit/go_vet.rb b/lib/overcommit/hook/pre_commit/go_vet.rb
index 7ddfa840..cc9151f9 100644
--- a/lib/overcommit/hook/pre_commit/go_vet.rb
+++ b/lib/overcommit/hook/pre_commit/go_vet.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `go vet` against any modified Golang files.
   #
diff --git a/lib/overcommit/hook/pre_commit/hadolint.rb b/lib/overcommit/hook/pre_commit/hadolint.rb
index 513259c8..dd26b2bb 100644
--- a/lib/overcommit/hook/pre_commit/hadolint.rb
+++ b/lib/overcommit/hook/pre_commit/hadolint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `hadolint` against any modified Dockefile files.
   #
diff --git a/lib/overcommit/hook/pre_commit/haml_lint.rb b/lib/overcommit/hook/pre_commit/haml_lint.rb
index f91dc303..af8d801a 100644
--- a/lib/overcommit/hook/pre_commit/haml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/haml_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `haml-lint` against any modified HAML files.
   #
diff --git a/lib/overcommit/hook/pre_commit/hard_tabs.rb b/lib/overcommit/hook/pre_commit/hard_tabs.rb
index 854337ee..0c94d4eb 100644
--- a/lib/overcommit/hook/pre_commit/hard_tabs.rb
+++ b/lib/overcommit/hook/pre_commit/hard_tabs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for hard tabs in files.
   class HardTabs < Base
diff --git a/lib/overcommit/hook/pre_commit/hlint.rb b/lib/overcommit/hook/pre_commit/hlint.rb
index fcbfa122..1ac2775c 100644
--- a/lib/overcommit/hook/pre_commit/hlint.rb
+++ b/lib/overcommit/hook/pre_commit/hlint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `hlint` against any modified Haskell files.
   #
diff --git a/lib/overcommit/hook/pre_commit/html_hint.rb b/lib/overcommit/hook/pre_commit/html_hint.rb
index 600e2c52..e8cb4a68 100644
--- a/lib/overcommit/hook/pre_commit/html_hint.rb
+++ b/lib/overcommit/hook/pre_commit/html_hint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `htmlhint` against any modified HTML files.
   #
diff --git a/lib/overcommit/hook/pre_commit/html_tidy.rb b/lib/overcommit/hook/pre_commit/html_tidy.rb
index e8c172e2..b4a2d89d 100644
--- a/lib/overcommit/hook/pre_commit/html_tidy.rb
+++ b/lib/overcommit/hook/pre_commit/html_tidy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `tidy` against any modified HTML files.
   #
diff --git a/lib/overcommit/hook/pre_commit/image_optim.rb b/lib/overcommit/hook/pre_commit/image_optim.rb
index a4cd75af..200a83f7 100644
--- a/lib/overcommit/hook/pre_commit/image_optim.rb
+++ b/lib/overcommit/hook/pre_commit/image_optim.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for images that can be optimized with `image_optim`.
   #
diff --git a/lib/overcommit/hook/pre_commit/java_checkstyle.rb b/lib/overcommit/hook/pre_commit/java_checkstyle.rb
index a8607860..4961eb12 100644
--- a/lib/overcommit/hook/pre_commit/java_checkstyle.rb
+++ b/lib/overcommit/hook/pre_commit/java_checkstyle.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `checkstyle` against any modified Java files.
   #
diff --git a/lib/overcommit/hook/pre_commit/js_hint.rb b/lib/overcommit/hook/pre_commit/js_hint.rb
index 943e64ca..6c22c538 100644
--- a/lib/overcommit/hook/pre_commit/js_hint.rb
+++ b/lib/overcommit/hook/pre_commit/js_hint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `jshint` against any modified JavaScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/js_lint.rb b/lib/overcommit/hook/pre_commit/js_lint.rb
index 4e2e6bab..3b6b8b87 100644
--- a/lib/overcommit/hook/pre_commit/js_lint.rb
+++ b/lib/overcommit/hook/pre_commit/js_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `jslint` against any modified JavaScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/jscs.rb b/lib/overcommit/hook/pre_commit/jscs.rb
index 23a63f1c..db3ee57b 100644
--- a/lib/overcommit/hook/pre_commit/jscs.rb
+++ b/lib/overcommit/hook/pre_commit/jscs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `jscs` (JavaScript Code Style Checker) against any modified JavaScript
   # files.
diff --git a/lib/overcommit/hook/pre_commit/jsl.rb b/lib/overcommit/hook/pre_commit/jsl.rb
index 97a00057..2b66ce94 100644
--- a/lib/overcommit/hook/pre_commit/jsl.rb
+++ b/lib/overcommit/hook/pre_commit/jsl.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `jsl` against any modified JavaScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/json_syntax.rb b/lib/overcommit/hook/pre_commit/json_syntax.rb
index bb6f785f..04972b91 100644
--- a/lib/overcommit/hook/pre_commit/json_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/json_syntax.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks the syntax of any modified JSON files.
   class JsonSyntax < Base
diff --git a/lib/overcommit/hook/pre_commit/kt_lint.rb b/lib/overcommit/hook/pre_commit/kt_lint.rb
index 42f4b387..8e80a581 100644
--- a/lib/overcommit/hook/pre_commit/kt_lint.rb
+++ b/lib/overcommit/hook/pre_commit/kt_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `ktlint` against modified Kotlin files.
   # @see https://github.com/shyiko/ktlint
diff --git a/lib/overcommit/hook/pre_commit/license_finder.rb b/lib/overcommit/hook/pre_commit/license_finder.rb
index 45383318..fc3739fe 100644
--- a/lib/overcommit/hook/pre_commit/license_finder.rb
+++ b/lib/overcommit/hook/pre_commit/license_finder.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs LicenseFinder if any of your package manager declaration files have changed
   # See more about LicenseFinder at https://github.com/pivotal/LicenseFinder
diff --git a/lib/overcommit/hook/pre_commit/license_header.rb b/lib/overcommit/hook/pre_commit/license_header.rb
index c13109c1..f129caf8 100644
--- a/lib/overcommit/hook/pre_commit/license_header.rb
+++ b/lib/overcommit/hook/pre_commit/license_header.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for license headers in source files
   class LicenseHeader < Base
diff --git a/lib/overcommit/hook/pre_commit/line_endings.rb b/lib/overcommit/hook/pre_commit/line_endings.rb
index 70b2e549..8f8eb9c7 100644
--- a/lib/overcommit/hook/pre_commit/line_endings.rb
+++ b/lib/overcommit/hook/pre_commit/line_endings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for line endings in files.
   #
diff --git a/lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb b/lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
index 8ca6694e..bf3db4ed 100644
--- a/lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
+++ b/lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for local paths in files and issues a warning
   class LocalPathsInGemfile < Base
diff --git a/lib/overcommit/hook/pre_commit/mdl.rb b/lib/overcommit/hook/pre_commit/mdl.rb
index 305d0c20..17eccc78 100644
--- a/lib/overcommit/hook/pre_commit/mdl.rb
+++ b/lib/overcommit/hook/pre_commit/mdl.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `mdl` against any modified Markdown files
   #
diff --git a/lib/overcommit/hook/pre_commit/merge_conflicts.rb b/lib/overcommit/hook/pre_commit/merge_conflicts.rb
index 33965bd8..1619d3c6 100644
--- a/lib/overcommit/hook/pre_commit/merge_conflicts.rb
+++ b/lib/overcommit/hook/pre_commit/merge_conflicts.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for unresolved merge conflicts
   class MergeConflicts < Base
diff --git a/lib/overcommit/hook/pre_commit/nginx_test.rb b/lib/overcommit/hook/pre_commit/nginx_test.rb
index 553ef0f5..cff43bbe 100644
--- a/lib/overcommit/hook/pre_commit/nginx_test.rb
+++ b/lib/overcommit/hook/pre_commit/nginx_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `nginx -t` against any modified Nginx config files.
   #
diff --git a/lib/overcommit/hook/pre_commit/pep257.rb b/lib/overcommit/hook/pre_commit/pep257.rb
index 339de9ea..01562039 100644
--- a/lib/overcommit/hook/pre_commit/pep257.rb
+++ b/lib/overcommit/hook/pre_commit/pep257.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pep257` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/pep8.rb b/lib/overcommit/hook/pre_commit/pep8.rb
index 954b2f91..5c42a6d5 100644
--- a/lib/overcommit/hook/pre_commit/pep8.rb
+++ b/lib/overcommit/hook/pre_commit/pep8.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pep8` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/php_cs.rb b/lib/overcommit/hook/pre_commit/php_cs.rb
index 86c400d7..6204c8dd 100644
--- a/lib/overcommit/hook/pre_commit/php_cs.rb
+++ b/lib/overcommit/hook/pre_commit/php_cs.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `phpcs` against any modified PHP files.
   class PhpCs < Base
diff --git a/lib/overcommit/hook/pre_commit/php_cs_fixer.rb b/lib/overcommit/hook/pre_commit/php_cs_fixer.rb
index a06caf09..02f8932e 100644
--- a/lib/overcommit/hook/pre_commit/php_cs_fixer.rb
+++ b/lib/overcommit/hook/pre_commit/php_cs_fixer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `php-cs-fixer` against any modified PHP files.
   class PhpCsFixer < Base
diff --git a/lib/overcommit/hook/pre_commit/php_lint.rb b/lib/overcommit/hook/pre_commit/php_lint.rb
index f34fc433..98582c3c 100644
--- a/lib/overcommit/hook/pre_commit/php_lint.rb
+++ b/lib/overcommit/hook/pre_commit/php_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `php -l` against any modified PHP files.
   class PhpLint < Base
diff --git a/lib/overcommit/hook/pre_commit/php_stan.rb b/lib/overcommit/hook/pre_commit/php_stan.rb
index 7b2c821b..d9971ff0 100644
--- a/lib/overcommit/hook/pre_commit/php_stan.rb
+++ b/lib/overcommit/hook/pre_commit/php_stan.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `phpstan` against any modified PHP files.
   # For running `phpstan` with Laravel, it requires setup with `ide_helper`.
diff --git a/lib/overcommit/hook/pre_commit/pronto.rb b/lib/overcommit/hook/pre_commit/pronto.rb
index 29b588cd..da016e8f 100644
--- a/lib/overcommit/hook/pre_commit/pronto.rb
+++ b/lib/overcommit/hook/pre_commit/pronto.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pronto`
   #
diff --git a/lib/overcommit/hook/pre_commit/puppet_lint.rb b/lib/overcommit/hook/pre_commit/puppet_lint.rb
index 14d01d9a..c67c248a 100644
--- a/lib/overcommit/hook/pre_commit/puppet_lint.rb
+++ b/lib/overcommit/hook/pre_commit/puppet_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs 'puppet-lint' against any modified Puppet files.
   #
diff --git a/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb b/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb
index 60fb3d52..b020b79c 100644
--- a/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb
+++ b/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   #
   # Run's the Puppet metadata linter. It has support for adding options
diff --git a/lib/overcommit/hook/pre_commit/pycodestyle.rb b/lib/overcommit/hook/pre_commit/pycodestyle.rb
index fa779afe..a15e7fb7 100644
--- a/lib/overcommit/hook/pre_commit/pycodestyle.rb
+++ b/lib/overcommit/hook/pre_commit/pycodestyle.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pycodestyle` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/pydocstyle.rb b/lib/overcommit/hook/pre_commit/pydocstyle.rb
index 379302f0..3556f2bf 100644
--- a/lib/overcommit/hook/pre_commit/pydocstyle.rb
+++ b/lib/overcommit/hook/pre_commit/pydocstyle.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pydocstyle` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/pyflakes.rb b/lib/overcommit/hook/pre_commit/pyflakes.rb
index 8c56ef1d..871f0594 100644
--- a/lib/overcommit/hook/pre_commit/pyflakes.rb
+++ b/lib/overcommit/hook/pre_commit/pyflakes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pyflakes` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/pylint.rb b/lib/overcommit/hook/pre_commit/pylint.rb
index 7ef6d57c..1ee92c9a 100644
--- a/lib/overcommit/hook/pre_commit/pylint.rb
+++ b/lib/overcommit/hook/pre_commit/pylint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `pylint` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/python_flake8.rb b/lib/overcommit/hook/pre_commit/python_flake8.rb
index 8ae893af..0e03bdf9 100644
--- a/lib/overcommit/hook/pre_commit/python_flake8.rb
+++ b/lib/overcommit/hook/pre_commit/python_flake8.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `flake8` against any modified Python files.
   #
diff --git a/lib/overcommit/hook/pre_commit/rails_best_practices.rb b/lib/overcommit/hook/pre_commit/rails_best_practices.rb
index 12dd8ffb..bda0101f 100644
--- a/lib/overcommit/hook/pre_commit/rails_best_practices.rb
+++ b/lib/overcommit/hook/pre_commit/rails_best_practices.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   module Hook
     module PreCommit
diff --git a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
index 59a45989..da0951bf 100644
--- a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+++ b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Check to see whether the schema file is in line with the migrations. When a
   # schema file is present but a migration file is not, this is usually a
diff --git a/lib/overcommit/hook/pre_commit/rake_target.rb b/lib/overcommit/hook/pre_commit/rake_target.rb
index 52f14c99..555fff42 100644
--- a/lib/overcommit/hook/pre_commit/rake_target.rb
+++ b/lib/overcommit/hook/pre_commit/rake_target.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/rake_target'
 
 module Overcommit::Hook::PreCommit
diff --git a/lib/overcommit/hook/pre_commit/reek.rb b/lib/overcommit/hook/pre_commit/reek.rb
index 4574a297..163d7206 100644
--- a/lib/overcommit/hook/pre_commit/reek.rb
+++ b/lib/overcommit/hook/pre_commit/reek.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `reek` against any modified Ruby files.
   #
diff --git a/lib/overcommit/hook/pre_commit/rst_lint.rb b/lib/overcommit/hook/pre_commit/rst_lint.rb
index d85be659..15f93584 100644
--- a/lib/overcommit/hook/pre_commit/rst_lint.rb
+++ b/lib/overcommit/hook/pre_commit/rst_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `rst-lint` against any modified reStructuredText files
   #
diff --git a/lib/overcommit/hook/pre_commit/rubo_cop.rb b/lib/overcommit/hook/pre_commit/rubo_cop.rb
index 2fe17207..71c88980 100644
--- a/lib/overcommit/hook/pre_commit/rubo_cop.rb
+++ b/lib/overcommit/hook/pre_commit/rubo_cop.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `rubocop` against any modified Ruby files.
   #
diff --git a/lib/overcommit/hook/pre_commit/ruby_lint.rb b/lib/overcommit/hook/pre_commit/ruby_lint.rb
index 6e0c23da..63403b22 100644
--- a/lib/overcommit/hook/pre_commit/ruby_lint.rb
+++ b/lib/overcommit/hook/pre_commit/ruby_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `ruby-lint` against any modified Ruby files.
   #
diff --git a/lib/overcommit/hook/pre_commit/scalariform.rb b/lib/overcommit/hook/pre_commit/scalariform.rb
index 3822a80e..6b766dd0 100644
--- a/lib/overcommit/hook/pre_commit/scalariform.rb
+++ b/lib/overcommit/hook/pre_commit/scalariform.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `scalariform` against any modified Scala files.
   #
diff --git a/lib/overcommit/hook/pre_commit/scalastyle.rb b/lib/overcommit/hook/pre_commit/scalastyle.rb
index 6034195a..55c6dc4f 100644
--- a/lib/overcommit/hook/pre_commit/scalastyle.rb
+++ b/lib/overcommit/hook/pre_commit/scalastyle.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `scalastyle` against any modified Scala files.
   #
diff --git a/lib/overcommit/hook/pre_commit/scss_lint.rb b/lib/overcommit/hook/pre_commit/scss_lint.rb
index 741c810b..d521a914 100644
--- a/lib/overcommit/hook/pre_commit/scss_lint.rb
+++ b/lib/overcommit/hook/pre_commit/scss_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `scss-lint` against any modified SCSS files.
   #
diff --git a/lib/overcommit/hook/pre_commit/semi_standard.rb b/lib/overcommit/hook/pre_commit/semi_standard.rb
index d88afb28..ce40119b 100644
--- a/lib/overcommit/hook/pre_commit/semi_standard.rb
+++ b/lib/overcommit/hook/pre_commit/semi_standard.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `semistandard` against any modified JavaScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/shell_check.rb b/lib/overcommit/hook/pre_commit/shell_check.rb
index d918c95c..03c7a64f 100644
--- a/lib/overcommit/hook/pre_commit/shell_check.rb
+++ b/lib/overcommit/hook/pre_commit/shell_check.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `shellcheck` against any modified shell script files.
   #
diff --git a/lib/overcommit/hook/pre_commit/slim_lint.rb b/lib/overcommit/hook/pre_commit/slim_lint.rb
index e373bcb5..8e1d1ce0 100644
--- a/lib/overcommit/hook/pre_commit/slim_lint.rb
+++ b/lib/overcommit/hook/pre_commit/slim_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `slim-lint` against any modified Slim templates.
   #
diff --git a/lib/overcommit/hook/pre_commit/sqlint.rb b/lib/overcommit/hook/pre_commit/sqlint.rb
index b5cae3c6..6568a987 100644
--- a/lib/overcommit/hook/pre_commit/sqlint.rb
+++ b/lib/overcommit/hook/pre_commit/sqlint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs 'sqlint' against any modified SQL files.
   #
diff --git a/lib/overcommit/hook/pre_commit/standard.rb b/lib/overcommit/hook/pre_commit/standard.rb
index ae8dfa5d..4d2ee277 100644
--- a/lib/overcommit/hook/pre_commit/standard.rb
+++ b/lib/overcommit/hook/pre_commit/standard.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `standard` against any modified JavaScript files.
   #
diff --git a/lib/overcommit/hook/pre_commit/stylelint.rb b/lib/overcommit/hook/pre_commit/stylelint.rb
index d0120eda..a063233a 100644
--- a/lib/overcommit/hook/pre_commit/stylelint.rb
+++ b/lib/overcommit/hook/pre_commit/stylelint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `stylelint` against any modified CSS file.
   #
diff --git a/lib/overcommit/hook/pre_commit/swift_lint.rb b/lib/overcommit/hook/pre_commit/swift_lint.rb
index b417a384..40e4a5eb 100644
--- a/lib/overcommit/hook/pre_commit/swift_lint.rb
+++ b/lib/overcommit/hook/pre_commit/swift_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `swiftlint lint` against modified Swift files.
   # @see https://github.com/realm/SwiftLint
diff --git a/lib/overcommit/hook/pre_commit/trailing_whitespace.rb b/lib/overcommit/hook/pre_commit/trailing_whitespace.rb
index b17e2871..62431cad 100644
--- a/lib/overcommit/hook/pre_commit/trailing_whitespace.rb
+++ b/lib/overcommit/hook/pre_commit/trailing_whitespace.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks for trailing whitespace in files.
   class TrailingWhitespace < Base
diff --git a/lib/overcommit/hook/pre_commit/travis_lint.rb b/lib/overcommit/hook/pre_commit/travis_lint.rb
index 9909a072..9fb4c681 100644
--- a/lib/overcommit/hook/pre_commit/travis_lint.rb
+++ b/lib/overcommit/hook/pre_commit/travis_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `travis-lint` against any modified Travis CI files.
   #
diff --git a/lib/overcommit/hook/pre_commit/ts_lint.rb b/lib/overcommit/hook/pre_commit/ts_lint.rb
index b91a9f04..7f8cc503 100644
--- a/lib/overcommit/hook/pre_commit/ts_lint.rb
+++ b/lib/overcommit/hook/pre_commit/ts_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `tslint` against modified TypeScript files.
   # @see http://palantir.github.io/tslint/
diff --git a/lib/overcommit/hook/pre_commit/vint.rb b/lib/overcommit/hook/pre_commit/vint.rb
index 91169e82..17d8f9a2 100644
--- a/lib/overcommit/hook/pre_commit/vint.rb
+++ b/lib/overcommit/hook/pre_commit/vint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `vint` against any modified Vim script files.
   #
diff --git a/lib/overcommit/hook/pre_commit/w3c_css.rb b/lib/overcommit/hook/pre_commit/w3c_css.rb
index 0193ea3e..f36230f6 100644
--- a/lib/overcommit/hook/pre_commit/w3c_css.rb
+++ b/lib/overcommit/hook/pre_commit/w3c_css.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `w3c_validators` against any modified CSS files.
   #
diff --git a/lib/overcommit/hook/pre_commit/w3c_html.rb b/lib/overcommit/hook/pre_commit/w3c_html.rb
index ae6a8a7c..5330ef4e 100644
--- a/lib/overcommit/hook/pre_commit/w3c_html.rb
+++ b/lib/overcommit/hook/pre_commit/w3c_html.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `w3c_validators` against any modified HTML files.
   #
diff --git a/lib/overcommit/hook/pre_commit/xml_lint.rb b/lib/overcommit/hook/pre_commit/xml_lint.rb
index 0be13e82..618f3e74 100644
--- a/lib/overcommit/hook/pre_commit/xml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/xml_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `xmllint` against any modified XML files.
   #
diff --git a/lib/overcommit/hook/pre_commit/xml_syntax.rb b/lib/overcommit/hook/pre_commit/xml_syntax.rb
index a84ac145..7ac05360 100644
--- a/lib/overcommit/hook/pre_commit/xml_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/xml_syntax.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks the syntax of any modified XML files.
   class XmlSyntax < Base
diff --git a/lib/overcommit/hook/pre_commit/yaml_lint.rb b/lib/overcommit/hook/pre_commit/yaml_lint.rb
index 6c6898a2..2b24a932 100644
--- a/lib/overcommit/hook/pre_commit/yaml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_lint.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Runs `YAMLLint` against any modified YAML files.
   #
diff --git a/lib/overcommit/hook/pre_commit/yaml_syntax.rb b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
index 9562087e..fa0c4e66 100644
--- a/lib/overcommit/hook/pre_commit/yaml_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Checks the syntax of any modified YAML files.
   class YamlSyntax < Base
diff --git a/lib/overcommit/hook/pre_commit/yard_coverage.rb b/lib/overcommit/hook/pre_commit/yard_coverage.rb
index fdb6c26a..b9336f0f 100644
--- a/lib/overcommit/hook/pre_commit/yard_coverage.rb
+++ b/lib/overcommit/hook/pre_commit/yard_coverage.rb
@@ -1,4 +1,6 @@
 
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
   # Class to check yard documentation coverage.
   #
diff --git a/lib/overcommit/hook/pre_commit/yarn_check.rb b/lib/overcommit/hook/pre_commit/yarn_check.rb
index 78a29cdc..f51402d3 100644
--- a/lib/overcommit/hook/pre_commit/yarn_check.rb
+++ b/lib/overcommit/hook/pre_commit/yarn_check.rb
@@ -6,13 +6,13 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://yarnpkg.com/en/docs/cli/check
   class YarnCheck < Base
-    LOCK_FILE = 'yarn.lock'.freeze
+    LOCK_FILE = 'yarn.lock'
 
     # A lot of the errors returned by `yarn check` are outside the developer's control
     # (are caused by bad package specification, in the hands of the upstream maintainer)
     # So limit reporting to errors the developer can do something about
     ACTIONABLE_ERRORS = [
-      'Lockfile does not contain pattern'.freeze,
+      'Lockfile does not contain pattern',
     ].freeze
 
     def run
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 7f07a9ac..3b27f23f 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PrePush
diff --git a/lib/overcommit/hook/pre_push/brakeman.rb b/lib/overcommit/hook/pre_push/brakeman.rb
index 9fe76e4e..c4fbf482 100644
--- a/lib/overcommit/hook/pre_push/brakeman.rb
+++ b/lib/overcommit/hook/pre_push/brakeman.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `brakeman` whenever Ruby/Rails files change.
   #
diff --git a/lib/overcommit/hook/pre_push/cargo_test.rb b/lib/overcommit/hook/pre_push/cargo_test.rb
index 70be95f7..33e5076b 100644
--- a/lib/overcommit/hook/pre_push/cargo_test.rb
+++ b/lib/overcommit/hook/pre_push/cargo_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `cargo test` before push if Rust files changed
   class CargoTest < Base
diff --git a/lib/overcommit/hook/pre_push/minitest.rb b/lib/overcommit/hook/pre_push/minitest.rb
index 450a8098..4743665e 100644
--- a/lib/overcommit/hook/pre_push/minitest.rb
+++ b/lib/overcommit/hook/pre_push/minitest.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `minitest` test suite before push
   #
diff --git a/lib/overcommit/hook/pre_push/php_unit.rb b/lib/overcommit/hook/pre_push/php_unit.rb
index 758718d5..ec500597 100644
--- a/lib/overcommit/hook/pre_push/php_unit.rb
+++ b/lib/overcommit/hook/pre_push/php_unit.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `phpunit` test suite before push
   #
diff --git a/lib/overcommit/hook/pre_push/protected_branches.rb b/lib/overcommit/hook/pre_push/protected_branches.rb
index e83ad8a1..fe943695 100644
--- a/lib/overcommit/hook/pre_push/protected_branches.rb
+++ b/lib/overcommit/hook/pre_push/protected_branches.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Prevents destructive updates to specified branches.
   class ProtectedBranches < Base
diff --git a/lib/overcommit/hook/pre_push/pytest.rb b/lib/overcommit/hook/pre_push/pytest.rb
index 109bf216..35c11561 100644
--- a/lib/overcommit/hook/pre_push/pytest.rb
+++ b/lib/overcommit/hook/pre_push/pytest.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `pytest` test suite before push
   #
diff --git a/lib/overcommit/hook/pre_push/python_nose.rb b/lib/overcommit/hook/pre_push/python_nose.rb
index da805773..94476e0e 100644
--- a/lib/overcommit/hook/pre_push/python_nose.rb
+++ b/lib/overcommit/hook/pre_push/python_nose.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `nose` test suite before push
   #
diff --git a/lib/overcommit/hook/pre_push/r_spec.rb b/lib/overcommit/hook/pre_push/r_spec.rb
index e9f4ebad..a3b4474c 100644
--- a/lib/overcommit/hook/pre_push/r_spec.rb
+++ b/lib/overcommit/hook/pre_push/r_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `rspec` test suite before push
   #
diff --git a/lib/overcommit/hook/pre_push/rake_target.rb b/lib/overcommit/hook/pre_push/rake_target.rb
index 304bbba5..eb480c20 100644
--- a/lib/overcommit/hook/pre_push/rake_target.rb
+++ b/lib/overcommit/hook/pre_push/rake_target.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/hook/shared/rake_target'
 
 module Overcommit::Hook::PrePush
diff --git a/lib/overcommit/hook/pre_push/test_unit.rb b/lib/overcommit/hook/pre_push/test_unit.rb
index 930a0f19..44ae9d71 100644
--- a/lib/overcommit/hook/pre_push/test_unit.rb
+++ b/lib/overcommit/hook/pre_push/test_unit.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrePush
   # Runs `test-unit` test suite before push
   #
diff --git a/lib/overcommit/hook/pre_rebase/base.rb b/lib/overcommit/hook/pre_rebase/base.rb
index 49ac6511..1dc72f1c 100644
--- a/lib/overcommit/hook/pre_rebase/base.rb
+++ b/lib/overcommit/hook/pre_rebase/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PreRebase
diff --git a/lib/overcommit/hook/pre_rebase/merged_commits.rb b/lib/overcommit/hook/pre_rebase/merged_commits.rb
index fd003942..7c522e8c 100644
--- a/lib/overcommit/hook/pre_rebase/merged_commits.rb
+++ b/lib/overcommit/hook/pre_rebase/merged_commits.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreRebase
   # Prevents rebasing commits that have already been merged into one of
   # a specified set of branches.
diff --git a/lib/overcommit/hook/prepare_commit_msg/base.rb b/lib/overcommit/hook/prepare_commit_msg/base.rb
index c278b5a6..5c0c68d4 100644
--- a/lib/overcommit/hook/prepare_commit_msg/base.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module Overcommit::Hook::PrepareCommitMsg
diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index 8a5c1f82..9aed7d73 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PrepareCommitMsg
   # Prepends the commit message with a message based on the branch name.
   # It's possible to reference parts of the branch name through the captures in
diff --git a/lib/overcommit/hook/shared/bower_install.rb b/lib/overcommit/hook/shared/bower_install.rb
index a0ecab63..b39d4ada 100644
--- a/lib/overcommit/hook/shared/bower_install.rb
+++ b/lib/overcommit/hook/shared/bower_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # Shared code used by all BowerInstall hooks. Runs `bower install` when a
   # change is detected in the repository's dependencies.
diff --git a/lib/overcommit/hook/shared/bundle_install.rb b/lib/overcommit/hook/shared/bundle_install.rb
index bfb2d560..060e30c5 100644
--- a/lib/overcommit/hook/shared/bundle_install.rb
+++ b/lib/overcommit/hook/shared/bundle_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # Shared code used by all BundleInstall hooks. Runs `bundle install` when a
   # change is detected in the repository's dependencies.
diff --git a/lib/overcommit/hook/shared/composer_install.rb b/lib/overcommit/hook/shared/composer_install.rb
index 828484e6..839dd65b 100644
--- a/lib/overcommit/hook/shared/composer_install.rb
+++ b/lib/overcommit/hook/shared/composer_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # Shared code used by all ComposerInstall hooks. Runs `composer install` when
   # a change is detected in the repository's dependencies.
diff --git a/lib/overcommit/hook/shared/index_tags.rb b/lib/overcommit/hook/shared/index_tags.rb
index ffc4a67e..99f7efde 100644
--- a/lib/overcommit/hook/shared/index_tags.rb
+++ b/lib/overcommit/hook/shared/index_tags.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 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.
diff --git a/lib/overcommit/hook/shared/npm_install.rb b/lib/overcommit/hook/shared/npm_install.rb
index 93dd0696..7fa06772 100644
--- a/lib/overcommit/hook/shared/npm_install.rb
+++ b/lib/overcommit/hook/shared/npm_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # Shared code used by all NpmInstall hooks. Runs `npm install` when a change
   # is detected in the repository's dependencies.
diff --git a/lib/overcommit/hook/shared/rake_target.rb b/lib/overcommit/hook/shared/rake_target.rb
index 82da8ec9..cbff2c19 100644
--- a/lib/overcommit/hook/shared/rake_target.rb
+++ b/lib/overcommit/hook/shared/rake_target.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # runs specified rake targets. It fails on the first non-
   # successfull exit.
diff --git a/lib/overcommit/hook/shared/submodule_status.rb b/lib/overcommit/hook/shared/submodule_status.rb
index fc35c32d..41e24aed 100644
--- a/lib/overcommit/hook/shared/submodule_status.rb
+++ b/lib/overcommit/hook/shared/submodule_status.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # Shared code used by all `SubmoduleStatus` hooks to notify the user if any
   # submodules are uninitialized, out of date with the current index, or contain
diff --git a/lib/overcommit/hook/shared/yarn_install.rb b/lib/overcommit/hook/shared/yarn_install.rb
index 5cc9b236..bc3b7869 100644
--- a/lib/overcommit/hook/shared/yarn_install.rb
+++ b/lib/overcommit/hook/shared/yarn_install.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::Shared
   # Shared code used by all YarnInstall hooks. Runs `yarn install` when a change
   # is detected in the repository's dependencies.
diff --git a/lib/overcommit/hook_context.rb b/lib/overcommit/hook_context.rb
index 567ac153..df12b86c 100644
--- a/lib/overcommit/hook_context.rb
+++ b/lib/overcommit/hook_context.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Utility module which manages the creation of {HookContext}s.
 module Overcommit::HookContext
   def self.create(hook_type, config, args, input)
diff --git a/lib/overcommit/hook_context/base.rb b/lib/overcommit/hook_context/base.rb
index 9d01ff2f..077394fb 100644
--- a/lib/overcommit/hook_context/base.rb
+++ b/lib/overcommit/hook_context/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to the context with which a hook is being run.
   #
diff --git a/lib/overcommit/hook_context/commit_msg.rb b/lib/overcommit/hook_context/commit_msg.rb
index ed97bbdc..a8a11ac2 100644
--- a/lib/overcommit/hook_context/commit_msg.rb
+++ b/lib/overcommit/hook_context/commit_msg.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by commit-msg hooks.
   class CommitMsg < Base
diff --git a/lib/overcommit/hook_context/post_checkout.rb b/lib/overcommit/hook_context/post_checkout.rb
index a9310974..a8d38649 100644
--- a/lib/overcommit/hook_context/post_checkout.rb
+++ b/lib/overcommit/hook_context/post_checkout.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by post-checkout
   # hooks.
diff --git a/lib/overcommit/hook_context/post_commit.rb b/lib/overcommit/hook_context/post_commit.rb
index e5ec6da6..0e780077 100644
--- a/lib/overcommit/hook_context/post_commit.rb
+++ b/lib/overcommit/hook_context/post_commit.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by post-commit
   # hooks.
diff --git a/lib/overcommit/hook_context/post_merge.rb b/lib/overcommit/hook_context/post_merge.rb
index d8547998..14f91826 100644
--- a/lib/overcommit/hook_context/post_merge.rb
+++ b/lib/overcommit/hook_context/post_merge.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by post-merge
   # hooks.
diff --git a/lib/overcommit/hook_context/post_rewrite.rb b/lib/overcommit/hook_context/post_rewrite.rb
index 249071dc..5310ef8e 100644
--- a/lib/overcommit/hook_context/post_rewrite.rb
+++ b/lib/overcommit/hook_context/post_rewrite.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers for contextual information used by post-rewrite hooks.
   class PostRewrite < Base
diff --git a/lib/overcommit/hook_context/pre_commit.rb b/lib/overcommit/hook_context/pre_commit.rb
index 32ee752d..ffd55914 100644
--- a/lib/overcommit/hook_context/pre_commit.rb
+++ b/lib/overcommit/hook_context/pre_commit.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'set'
 
@@ -19,7 +21,8 @@ def amendment?
       # containing unicode characters, we replace the offending characters,
       # since the pattern we're looking for will consist of ASCII characters
       unless cmd.valid_encoding?
-        cmd.encode!('UTF-16be', invalid: :replace, replace: '?').encode!('UTF-8')
+        cmd = Overcommit::Utils.parent_command.encode('UTF-16be', invalid: :replace, replace: '?')
+                               .encode('UTF-8')
       end
 
       return @amendment if
diff --git a/lib/overcommit/hook_context/pre_push.rb b/lib/overcommit/hook_context/pre_push.rb
index 66fa0c91..715e5918 100644
--- a/lib/overcommit/hook_context/pre_push.rb
+++ b/lib/overcommit/hook_context/pre_push.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by pre-push hooks.
   class PrePush < Base
diff --git a/lib/overcommit/hook_context/pre_rebase.rb b/lib/overcommit/hook_context/pre_rebase.rb
index 5a2ca149..f681e067 100644
--- a/lib/overcommit/hook_context/pre_rebase.rb
+++ b/lib/overcommit/hook_context/pre_rebase.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by pre-rebase
   # hooks.
diff --git a/lib/overcommit/hook_context/prepare_commit_msg.rb b/lib/overcommit/hook_context/prepare_commit_msg.rb
index d5bbf993..781fab73 100644
--- a/lib/overcommit/hook_context/prepare_commit_msg.rb
+++ b/lib/overcommit/hook_context/prepare_commit_msg.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by prepare-commit-msg
   # hooks.
@@ -14,7 +16,7 @@ def commit_message_filename
     # exists); or commit, followed by a commit SHA-1 (if a -c, -C or --amend
     # option was given)
     def commit_message_source
-      @args[1].to_sym if @args[1]
+      @args[1]&.to_sym
     end
 
     # Returns the commit's SHA-1.
diff --git a/lib/overcommit/hook_context/run_all.rb b/lib/overcommit/hook_context/run_all.rb
index 537bff11..e7acee57 100644
--- a/lib/overcommit/hook_context/run_all.rb
+++ b/lib/overcommit/hook_context/run_all.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module Overcommit::HookContext
diff --git a/lib/overcommit/hook_loader/base.rb b/lib/overcommit/hook_loader/base.rb
index 020bcf5b..3e13472d 100644
--- a/lib/overcommit/hook_loader/base.rb
+++ b/lib/overcommit/hook_loader/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookLoader
   # Responsible for loading hooks from a file.
   class Base
diff --git a/lib/overcommit/hook_loader/built_in_hook_loader.rb b/lib/overcommit/hook_loader/built_in_hook_loader.rb
index 5d3be7e5..1b7d3f87 100644
--- a/lib/overcommit/hook_loader/built_in_hook_loader.rb
+++ b/lib/overcommit/hook_loader/built_in_hook_loader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::HookLoader
   # Responsible for loading hooks that ship with Overcommit.
   class BuiltInHookLoader < Base
diff --git a/lib/overcommit/hook_loader/plugin_hook_loader.rb b/lib/overcommit/hook_loader/plugin_hook_loader.rb
index df7e06e2..b57d7095 100644
--- a/lib/overcommit/hook_loader/plugin_hook_loader.rb
+++ b/lib/overcommit/hook_loader/plugin_hook_loader.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest'
 
 module Overcommit::HookLoader
diff --git a/lib/overcommit/hook_runner.rb b/lib/overcommit/hook_runner.rb
index 505674e5..16af2c23 100644
--- a/lib/overcommit/hook_runner.rb
+++ b/lib/overcommit/hook_runner.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Responsible for loading the hooks the repository has configured and running
   # them, collecting and displaying the results.
diff --git a/lib/overcommit/hook_signer.rb b/lib/overcommit/hook_signer.rb
index 796585bc..f432ca48 100644
--- a/lib/overcommit/hook_signer.rb
+++ b/lib/overcommit/hook_signer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Calculates, stores, and retrieves stored signatures of hook plugins.
   class HookSigner
diff --git a/lib/overcommit/installer.rb b/lib/overcommit/installer.rb
index 1cc0b058..11d598e8 100644
--- a/lib/overcommit/installer.rb
+++ b/lib/overcommit/installer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Overcommit
diff --git a/lib/overcommit/interrupt_handler.rb b/lib/overcommit/interrupt_handler.rb
index 96ee2400..4dc085ab 100644
--- a/lib/overcommit/interrupt_handler.rb
+++ b/lib/overcommit/interrupt_handler.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 
 # Provides a handler for interrupt signals (SIGINT), allowing the application to
diff --git a/lib/overcommit/logger.rb b/lib/overcommit/logger.rb
index 87cb4e7e..99fc43f7 100644
--- a/lib/overcommit/logger.rb
+++ b/lib/overcommit/logger.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Encapsulates all communication to an output source.
   class Logger
diff --git a/lib/overcommit/message_processor.rb b/lib/overcommit/message_processor.rb
index eac9fb00..c1bedf96 100644
--- a/lib/overcommit/message_processor.rb
+++ b/lib/overcommit/message_processor.rb
@@ -8,12 +8,12 @@ module Overcommit
   # output tuple from an array of {Overcommit::Hook::Message}s, respecting the
   # configuration settings for the given hook.
   class MessageProcessor
-    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'.freeze
-    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'.freeze
-    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:".freeze
-    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:".freeze
-    ERRORS_GENERIC_HEADER = 'Errors:'.freeze
-    WARNINGS_GENERIC_HEADER = 'Warnings:'.freeze
+    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'
+    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'
+    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:"
+    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:"
+    ERRORS_GENERIC_HEADER = 'Errors:'
+    WARNINGS_GENERIC_HEADER = 'Warnings:'
 
     # @param hook [Overcommit::Hook::Base]
     # @param unmodified_lines_setting [String] how to treat messages on
diff --git a/lib/overcommit/os.rb b/lib/overcommit/os.rb
index d6b0ce18..7b525a1a 100644
--- a/lib/overcommit/os.rb
+++ b/lib/overcommit/os.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 module Overcommit
diff --git a/lib/overcommit/printer.rb b/lib/overcommit/printer.rb
index 4208a4b6..aebb8326 100644
--- a/lib/overcommit/printer.rb
+++ b/lib/overcommit/printer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'monitor'
 
 module Overcommit
diff --git a/lib/overcommit/subprocess.rb b/lib/overcommit/subprocess.rb
index 386fc6fb..47713ff2 100644
--- a/lib/overcommit/subprocess.rb
+++ b/lib/overcommit/subprocess.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'childprocess'
 require 'tempfile'
 
diff --git a/lib/overcommit/utils.rb b/lib/overcommit/utils.rb
index 2961f52e..d99fa0d4 100644
--- a/lib/overcommit/utils.rb
+++ b/lib/overcommit/utils.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'overcommit/os'
 require 'overcommit/subprocess'
@@ -295,7 +297,7 @@ def matches_path?(pattern, path)
       #
       # @param args [Array<String>]
       def debug(*args)
-        log.debug(*args) if log
+        log&.debug(*args)
       end
     end
   end
diff --git a/lib/overcommit/utils/file_utils.rb b/lib/overcommit/utils/file_utils.rb
index f96cc8ad..cff2ce0b 100644
--- a/lib/overcommit/utils/file_utils.rb
+++ b/lib/overcommit/utils/file_utils.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/os'
 require 'overcommit/subprocess'
 
diff --git a/lib/overcommit/utils/messages_utils.rb b/lib/overcommit/utils/messages_utils.rb
index caca39d2..642e3e22 100644
--- a/lib/overcommit/utils/messages_utils.rb
+++ b/lib/overcommit/utils/messages_utils.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Utils
   # Utility to process messages
   module MessagesUtils
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 49954888..541af57d 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.46.0'.freeze
+  VERSION = '0.46.0'
 end
diff --git a/spec/integration/committing_spec.rb b/spec/integration/committing_spec.rb
index ca5afcfe..6bdd0f08 100644
--- a/spec/integration/committing_spec.rb
+++ b/spec/integration/committing_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'commiting' do
diff --git a/spec/integration/configuration_signing_spec.rb b/spec/integration/configuration_signing_spec.rb
index e7ccb7b7..0b1e0b38 100644
--- a/spec/integration/configuration_signing_spec.rb
+++ b/spec/integration/configuration_signing_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'yaml'
 
diff --git a/spec/integration/disable_overcommit_spec.rb b/spec/integration/disable_overcommit_spec.rb
index 2bcdaebf..04243cd5 100644
--- a/spec/integration/disable_overcommit_spec.rb
+++ b/spec/integration/disable_overcommit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'disabling Overcommit' do
diff --git a/spec/integration/gemfile_option_spec.rb b/spec/integration/gemfile_option_spec.rb
index 5d29c7c8..d67910aa 100644
--- a/spec/integration/gemfile_option_spec.rb
+++ b/spec/integration/gemfile_option_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'specifying `gemfile` option in Overcommit configuration' do
diff --git a/spec/integration/hook_signing_spec.rb b/spec/integration/hook_signing_spec.rb
index 6992fb06..6392a64e 100644
--- a/spec/integration/hook_signing_spec.rb
+++ b/spec/integration/hook_signing_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'yaml'
 
diff --git a/spec/integration/installing_overcommit_spec.rb b/spec/integration/installing_overcommit_spec.rb
index 965f970d..5c8ebe35 100644
--- a/spec/integration/installing_overcommit_spec.rb
+++ b/spec/integration/installing_overcommit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'installing Overcommit' do
diff --git a/spec/integration/parallelize_spec.rb b/spec/integration/parallelize_spec.rb
index 8c2b8205..4cf4c52d 100644
--- a/spec/integration/parallelize_spec.rb
+++ b/spec/integration/parallelize_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'timeout'
 
diff --git a/spec/integration/protected_branches_spec.rb b/spec/integration/protected_branches_spec.rb
index 402be380..8eade771 100644
--- a/spec/integration/protected_branches_spec.rb
+++ b/spec/integration/protected_branches_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::ProtectedBranches,
diff --git a/spec/integration/resolving_cherry_pick_conflict_spec.rb b/spec/integration/resolving_cherry_pick_conflict_spec.rb
index cb9f91f5..2ea05d7b 100644
--- a/spec/integration/resolving_cherry_pick_conflict_spec.rb
+++ b/spec/integration/resolving_cherry_pick_conflict_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'resolving cherry-pick conflicts' do
diff --git a/spec/integration/resolving_merge_conflict_spec.rb b/spec/integration/resolving_merge_conflict_spec.rb
index de1e5301..679ba136 100644
--- a/spec/integration/resolving_merge_conflict_spec.rb
+++ b/spec/integration/resolving_merge_conflict_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'resolving merge conflicts' do
diff --git a/spec/integration/run_flag_spec.rb b/spec/integration/run_flag_spec.rb
index 107db518..65284f29 100644
--- a/spec/integration/run_flag_spec.rb
+++ b/spec/integration/run_flag_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'overcommit --run' do
diff --git a/spec/integration/template_dir_spec.rb b/spec/integration/template_dir_spec.rb
index 76e4c1b4..ebcff83c 100644
--- a/spec/integration/template_dir_spec.rb
+++ b/spec/integration/template_dir_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fileutils'
 
diff --git a/spec/overcommit/cli_spec.rb b/spec/overcommit/cli_spec.rb
index fa12d359..40923ad3 100644
--- a/spec/overcommit/cli_spec.rb
+++ b/spec/overcommit/cli_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/cli'
 require 'overcommit/hook_context/run_all'
diff --git a/spec/overcommit/command_splitter_spec.rb b/spec/overcommit/command_splitter_spec.rb
index 2da34ba0..5db2e82f 100644
--- a/spec/overcommit/command_splitter_spec.rb
+++ b/spec/overcommit/command_splitter_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::CommandSplitter do
diff --git a/spec/overcommit/configuration_loader_spec.rb b/spec/overcommit/configuration_loader_spec.rb
index a454f10e..a99608d4 100644
--- a/spec/overcommit/configuration_loader_spec.rb
+++ b/spec/overcommit/configuration_loader_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::ConfigurationLoader do
diff --git a/spec/overcommit/configuration_spec.rb b/spec/overcommit/configuration_spec.rb
index 4d43188c..d9860400 100644
--- a/spec/overcommit/configuration_spec.rb
+++ b/spec/overcommit/configuration_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Configuration do
diff --git a/spec/overcommit/configuration_validator_spec.rb b/spec/overcommit/configuration_validator_spec.rb
index ed5f0a01..52320633 100644
--- a/spec/overcommit/configuration_validator_spec.rb
+++ b/spec/overcommit/configuration_validator_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::ConfigurationValidator do
diff --git a/spec/overcommit/default_configuration_spec.rb b/spec/overcommit/default_configuration_spec.rb
index 271d37d6..a86b1fe3 100644
--- a/spec/overcommit/default_configuration_spec.rb
+++ b/spec/overcommit/default_configuration_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'default configuration' do
diff --git a/spec/overcommit/git_config_spec.rb b/spec/overcommit/git_config_spec.rb
index acb4619b..22ad7c02 100644
--- a/spec/overcommit/git_config_spec.rb
+++ b/spec/overcommit/git_config_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::GitConfig do
diff --git a/spec/overcommit/git_repo_spec.rb b/spec/overcommit/git_repo_spec.rb
index 10bfbf88..b5376212 100644
--- a/spec/overcommit/git_repo_spec.rb
+++ b/spec/overcommit/git_repo_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::GitRepo do
diff --git a/spec/overcommit/hook/base_spec.rb b/spec/overcommit/hook/base_spec.rb
index c3caf2a2..012b764c 100644
--- a/spec/overcommit/hook/base_spec.rb
+++ b/spec/overcommit/hook/base_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::Base do
diff --git a/spec/overcommit/hook/commit_msg/capitalized_subject_spec.rb b/spec/overcommit/hook/commit_msg/capitalized_subject_spec.rb
index 0b047401..77adaf69 100644
--- a/spec/overcommit/hook/commit_msg/capitalized_subject_spec.rb
+++ b/spec/overcommit/hook/commit_msg/capitalized_subject_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::CapitalizedSubject do
diff --git a/spec/overcommit/hook/commit_msg/empty_message_spec.rb b/spec/overcommit/hook/commit_msg/empty_message_spec.rb
index 5ccfcb23..94eeb468 100644
--- a/spec/overcommit/hook/commit_msg/empty_message_spec.rb
+++ b/spec/overcommit/hook/commit_msg/empty_message_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::EmptyMessage do
diff --git a/spec/overcommit/hook/commit_msg/gerrit_change_id_spec.rb b/spec/overcommit/hook/commit_msg/gerrit_change_id_spec.rb
index 49d13c07..e9b0577e 100644
--- a/spec/overcommit/hook/commit_msg/gerrit_change_id_spec.rb
+++ b/spec/overcommit/hook/commit_msg/gerrit_change_id_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::GerritChangeId do
diff --git a/spec/overcommit/hook/commit_msg/hard_tabs_spec.rb b/spec/overcommit/hook/commit_msg/hard_tabs_spec.rb
index 68900dd1..2898ff0a 100644
--- a/spec/overcommit/hook/commit_msg/hard_tabs_spec.rb
+++ b/spec/overcommit/hook/commit_msg/hard_tabs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::HardTabs do
diff --git a/spec/overcommit/hook/commit_msg/message_format_spec.rb b/spec/overcommit/hook/commit_msg/message_format_spec.rb
index 21952479..5197e2b2 100644
--- a/spec/overcommit/hook/commit_msg/message_format_spec.rb
+++ b/spec/overcommit/hook/commit_msg/message_format_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::MessageFormat do
diff --git a/spec/overcommit/hook/commit_msg/russian_novel_spec.rb b/spec/overcommit/hook/commit_msg/russian_novel_spec.rb
index 599a34a3..6f531a04 100644
--- a/spec/overcommit/hook/commit_msg/russian_novel_spec.rb
+++ b/spec/overcommit/hook/commit_msg/russian_novel_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::RussianNovel do
diff --git a/spec/overcommit/hook/commit_msg/single_line_subject_spec.rb b/spec/overcommit/hook/commit_msg/single_line_subject_spec.rb
index 2d4c5ef5..96ed6e32 100644
--- a/spec/overcommit/hook/commit_msg/single_line_subject_spec.rb
+++ b/spec/overcommit/hook/commit_msg/single_line_subject_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::SingleLineSubject do
diff --git a/spec/overcommit/hook/commit_msg/spell_check_spec.rb b/spec/overcommit/hook/commit_msg/spell_check_spec.rb
index 6479b316..6eae073f 100644
--- a/spec/overcommit/hook/commit_msg/spell_check_spec.rb
+++ b/spec/overcommit/hook/commit_msg/spell_check_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::SpellCheck do
diff --git a/spec/overcommit/hook/commit_msg/text_width_spec.rb b/spec/overcommit/hook/commit_msg/text_width_spec.rb
index 2c11002b..e07d777e 100644
--- a/spec/overcommit/hook/commit_msg/text_width_spec.rb
+++ b/spec/overcommit/hook/commit_msg/text_width_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::TextWidth do
diff --git a/spec/overcommit/hook/commit_msg/trailing_period_spec.rb b/spec/overcommit/hook/commit_msg/trailing_period_spec.rb
index ea5f91c6..cee57981 100644
--- a/spec/overcommit/hook/commit_msg/trailing_period_spec.rb
+++ b/spec/overcommit/hook/commit_msg/trailing_period_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::TrailingPeriod do
diff --git a/spec/overcommit/hook/post_checkout/base_spec.rb b/spec/overcommit/hook/post_checkout/base_spec.rb
index ecdb7dbd..ee3a9b2d 100644
--- a/spec/overcommit/hook/post_checkout/base_spec.rb
+++ b/spec/overcommit/hook/post_checkout/base_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::Base do
diff --git a/spec/overcommit/hook/post_checkout/bower_install_spec.rb b/spec/overcommit/hook/post_checkout/bower_install_spec.rb
index 6720a244..1dd0bc2e 100644
--- a/spec/overcommit/hook/post_checkout/bower_install_spec.rb
+++ b/spec/overcommit/hook/post_checkout/bower_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::BowerInstall do
diff --git a/spec/overcommit/hook/post_checkout/bundle_install_spec.rb b/spec/overcommit/hook/post_checkout/bundle_install_spec.rb
index 3c9f46b5..0a375d54 100644
--- a/spec/overcommit/hook/post_checkout/bundle_install_spec.rb
+++ b/spec/overcommit/hook/post_checkout/bundle_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::BundleInstall do
diff --git a/spec/overcommit/hook/post_checkout/composer_install_spec.rb b/spec/overcommit/hook/post_checkout/composer_install_spec.rb
index bf041e6f..1b43b54b 100644
--- a/spec/overcommit/hook/post_checkout/composer_install_spec.rb
+++ b/spec/overcommit/hook/post_checkout/composer_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::ComposerInstall do
diff --git a/spec/overcommit/hook/post_checkout/index_tags_spec.rb b/spec/overcommit/hook/post_checkout/index_tags_spec.rb
index 1476eb6c..93d79db0 100644
--- a/spec/overcommit/hook/post_checkout/index_tags_spec.rb
+++ b/spec/overcommit/hook/post_checkout/index_tags_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::IndexTags do
diff --git a/spec/overcommit/hook/post_checkout/npm_install_spec.rb b/spec/overcommit/hook/post_checkout/npm_install_spec.rb
index 41842735..00d324ce 100644
--- a/spec/overcommit/hook/post_checkout/npm_install_spec.rb
+++ b/spec/overcommit/hook/post_checkout/npm_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::NpmInstall do
diff --git a/spec/overcommit/hook/post_checkout/submodule_status_spec.rb b/spec/overcommit/hook/post_checkout/submodule_status_spec.rb
index 45078f46..799256b3 100644
--- a/spec/overcommit/hook/post_checkout/submodule_status_spec.rb
+++ b/spec/overcommit/hook/post_checkout/submodule_status_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::SubmoduleStatus do
diff --git a/spec/overcommit/hook/post_checkout/yarn_install_spec.rb b/spec/overcommit/hook/post_checkout/yarn_install_spec.rb
index f243dfc0..95028e77 100644
--- a/spec/overcommit/hook/post_checkout/yarn_install_spec.rb
+++ b/spec/overcommit/hook/post_checkout/yarn_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCheckout::YarnInstall do
diff --git a/spec/overcommit/hook/post_commit/bower_install_spec.rb b/spec/overcommit/hook/post_commit/bower_install_spec.rb
index 7d5417f8..e42b4038 100644
--- a/spec/overcommit/hook/post_commit/bower_install_spec.rb
+++ b/spec/overcommit/hook/post_commit/bower_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::BowerInstall do
diff --git a/spec/overcommit/hook/post_commit/bundle_install_spec.rb b/spec/overcommit/hook/post_commit/bundle_install_spec.rb
index 1445436e..7c4f85db 100644
--- a/spec/overcommit/hook/post_commit/bundle_install_spec.rb
+++ b/spec/overcommit/hook/post_commit/bundle_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::BundleInstall do
diff --git a/spec/overcommit/hook/post_commit/commitplease_spec.rb b/spec/overcommit/hook/post_commit/commitplease_spec.rb
index 25dbfbcf..e6b38bc8 100644
--- a/spec/overcommit/hook/post_commit/commitplease_spec.rb
+++ b/spec/overcommit/hook/post_commit/commitplease_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::Commitplease do
diff --git a/spec/overcommit/hook/post_commit/composer_install_spec.rb b/spec/overcommit/hook/post_commit/composer_install_spec.rb
index 499ec8ea..13abe5e0 100644
--- a/spec/overcommit/hook/post_commit/composer_install_spec.rb
+++ b/spec/overcommit/hook/post_commit/composer_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::ComposerInstall do
diff --git a/spec/overcommit/hook/post_commit/git_guilt_spec.rb b/spec/overcommit/hook/post_commit/git_guilt_spec.rb
index 28c8c9f6..d099b507 100644
--- a/spec/overcommit/hook/post_commit/git_guilt_spec.rb
+++ b/spec/overcommit/hook/post_commit/git_guilt_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::GitGuilt do
diff --git a/spec/overcommit/hook/post_commit/index_tags_spec.rb b/spec/overcommit/hook/post_commit/index_tags_spec.rb
index d5ebcb65..eb3a5e10 100644
--- a/spec/overcommit/hook/post_commit/index_tags_spec.rb
+++ b/spec/overcommit/hook/post_commit/index_tags_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::IndexTags do
diff --git a/spec/overcommit/hook/post_commit/npm_install_spec.rb b/spec/overcommit/hook/post_commit/npm_install_spec.rb
index 81bbd325..d3405cd4 100644
--- a/spec/overcommit/hook/post_commit/npm_install_spec.rb
+++ b/spec/overcommit/hook/post_commit/npm_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::NpmInstall do
diff --git a/spec/overcommit/hook/post_commit/submodule_status_spec.rb b/spec/overcommit/hook/post_commit/submodule_status_spec.rb
index 2c12d5fe..6d46a4e1 100644
--- a/spec/overcommit/hook/post_commit/submodule_status_spec.rb
+++ b/spec/overcommit/hook/post_commit/submodule_status_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::SubmoduleStatus do
diff --git a/spec/overcommit/hook/post_commit/yarn_install_spec.rb b/spec/overcommit/hook/post_commit/yarn_install_spec.rb
index abdaeae0..dfc77908 100644
--- a/spec/overcommit/hook/post_commit/yarn_install_spec.rb
+++ b/spec/overcommit/hook/post_commit/yarn_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostCommit::YarnInstall do
diff --git a/spec/overcommit/hook/post_merge/bower_install_spec.rb b/spec/overcommit/hook/post_merge/bower_install_spec.rb
index 63f5cbaf..163b5d12 100644
--- a/spec/overcommit/hook/post_merge/bower_install_spec.rb
+++ b/spec/overcommit/hook/post_merge/bower_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::BowerInstall do
diff --git a/spec/overcommit/hook/post_merge/bundle_install_spec.rb b/spec/overcommit/hook/post_merge/bundle_install_spec.rb
index ed463dac..1c2ad3b2 100644
--- a/spec/overcommit/hook/post_merge/bundle_install_spec.rb
+++ b/spec/overcommit/hook/post_merge/bundle_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::BundleInstall do
diff --git a/spec/overcommit/hook/post_merge/composer_install_spec.rb b/spec/overcommit/hook/post_merge/composer_install_spec.rb
index fb092bc2..94d00083 100644
--- a/spec/overcommit/hook/post_merge/composer_install_spec.rb
+++ b/spec/overcommit/hook/post_merge/composer_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::ComposerInstall do
diff --git a/spec/overcommit/hook/post_merge/index_tags_spec.rb b/spec/overcommit/hook/post_merge/index_tags_spec.rb
index e897ddf4..2ac6fad1 100644
--- a/spec/overcommit/hook/post_merge/index_tags_spec.rb
+++ b/spec/overcommit/hook/post_merge/index_tags_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::IndexTags do
diff --git a/spec/overcommit/hook/post_merge/npm_install_spec.rb b/spec/overcommit/hook/post_merge/npm_install_spec.rb
index 9f63d717..017d7a36 100644
--- a/spec/overcommit/hook/post_merge/npm_install_spec.rb
+++ b/spec/overcommit/hook/post_merge/npm_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::NpmInstall do
diff --git a/spec/overcommit/hook/post_merge/submodule_status_spec.rb b/spec/overcommit/hook/post_merge/submodule_status_spec.rb
index 245fe6c1..c0dd2efc 100644
--- a/spec/overcommit/hook/post_merge/submodule_status_spec.rb
+++ b/spec/overcommit/hook/post_merge/submodule_status_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::SubmoduleStatus do
diff --git a/spec/overcommit/hook/post_merge/yarn_install_spec.rb b/spec/overcommit/hook/post_merge/yarn_install_spec.rb
index d40fa95a..b9648712 100644
--- a/spec/overcommit/hook/post_merge/yarn_install_spec.rb
+++ b/spec/overcommit/hook/post_merge/yarn_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::YarnInstall do
diff --git a/spec/overcommit/hook/post_rewrite/bower_install_spec.rb b/spec/overcommit/hook/post_rewrite/bower_install_spec.rb
index a3a1a1b1..fe2ebd35 100644
--- a/spec/overcommit/hook/post_rewrite/bower_install_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/bower_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostRewrite::BowerInstall do
diff --git a/spec/overcommit/hook/post_rewrite/bundle_install_spec.rb b/spec/overcommit/hook/post_rewrite/bundle_install_spec.rb
index b3703ccb..93d05773 100644
--- a/spec/overcommit/hook/post_rewrite/bundle_install_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/bundle_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostRewrite::BundleInstall do
diff --git a/spec/overcommit/hook/post_rewrite/composer_install_spec.rb b/spec/overcommit/hook/post_rewrite/composer_install_spec.rb
index fd44d43c..30c2091f 100644
--- a/spec/overcommit/hook/post_rewrite/composer_install_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/composer_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostRewrite::ComposerInstall do
diff --git a/spec/overcommit/hook/post_rewrite/index_tags_spec.rb b/spec/overcommit/hook/post_rewrite/index_tags_spec.rb
index e897ddf4..2ac6fad1 100644
--- a/spec/overcommit/hook/post_rewrite/index_tags_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/index_tags_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostMerge::IndexTags do
diff --git a/spec/overcommit/hook/post_rewrite/npm_install_spec.rb b/spec/overcommit/hook/post_rewrite/npm_install_spec.rb
index 2af2291f..24b72a5a 100644
--- a/spec/overcommit/hook/post_rewrite/npm_install_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/npm_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostRewrite::NpmInstall do
diff --git a/spec/overcommit/hook/post_rewrite/submodule_status_spec.rb b/spec/overcommit/hook/post_rewrite/submodule_status_spec.rb
index c783c029..a5770745 100644
--- a/spec/overcommit/hook/post_rewrite/submodule_status_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/submodule_status_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostRewrite::SubmoduleStatus do
diff --git a/spec/overcommit/hook/post_rewrite/yarn_install_spec.rb b/spec/overcommit/hook/post_rewrite/yarn_install_spec.rb
index d2c57e0d..9774d1ab 100644
--- a/spec/overcommit/hook/post_rewrite/yarn_install_spec.rb
+++ b/spec/overcommit/hook/post_rewrite/yarn_install_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PostRewrite::YarnInstall do
diff --git a/spec/overcommit/hook/pre_commit/author_email_spec.rb b/spec/overcommit/hook/pre_commit/author_email_spec.rb
index 97d24397..613f114e 100644
--- a/spec/overcommit/hook/pre_commit/author_email_spec.rb
+++ b/spec/overcommit/hook/pre_commit/author_email_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::AuthorEmail do
diff --git a/spec/overcommit/hook/pre_commit/author_name_spec.rb b/spec/overcommit/hook/pre_commit/author_name_spec.rb
index 0981f1be..7cf230d5 100644
--- a/spec/overcommit/hook/pre_commit/author_name_spec.rb
+++ b/spec/overcommit/hook/pre_commit/author_name_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::AuthorName do
diff --git a/spec/overcommit/hook/pre_commit/berksfile_check_spec.rb b/spec/overcommit/hook/pre_commit/berksfile_check_spec.rb
index a6c24355..58d82517 100644
--- a/spec/overcommit/hook/pre_commit/berksfile_check_spec.rb
+++ b/spec/overcommit/hook/pre_commit/berksfile_check_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::BerksfileCheck do
diff --git a/spec/overcommit/hook/pre_commit/broken_symlinks_spec.rb b/spec/overcommit/hook/pre_commit/broken_symlinks_spec.rb
index b3058aae..84ce890e 100644
--- a/spec/overcommit/hook/pre_commit/broken_symlinks_spec.rb
+++ b/spec/overcommit/hook/pre_commit/broken_symlinks_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::BrokenSymlinks do
diff --git a/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb b/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb
index 7fa2fc89..633e14fe 100644
--- a/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb
+++ b/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::BundleAudit do
diff --git a/spec/overcommit/hook/pre_commit/bundle_check_spec.rb b/spec/overcommit/hook/pre_commit/bundle_check_spec.rb
index bc11a065..b8a471a1 100644
--- a/spec/overcommit/hook/pre_commit/bundle_check_spec.rb
+++ b/spec/overcommit/hook/pre_commit/bundle_check_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::BundleCheck do
diff --git a/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb b/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb
index 3ae32a4c..c61e4873 100644
--- a/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb
+++ b/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::BundleOutdated do
diff --git a/spec/overcommit/hook/pre_commit/case_conflicts_spec.rb b/spec/overcommit/hook/pre_commit/case_conflicts_spec.rb
index 0d7281d0..1ce157d5 100644
--- a/spec/overcommit/hook/pre_commit/case_conflicts_spec.rb
+++ b/spec/overcommit/hook/pre_commit/case_conflicts_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::CaseConflicts do
diff --git a/spec/overcommit/hook/pre_commit/chamber_compare_spec.rb b/spec/overcommit/hook/pre_commit/chamber_compare_spec.rb
index a9d76712..de9fffa2 100644
--- a/spec/overcommit/hook/pre_commit/chamber_compare_spec.rb
+++ b/spec/overcommit/hook/pre_commit/chamber_compare_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ChamberCompare do
diff --git a/spec/overcommit/hook/pre_commit/chamber_security_spec.rb b/spec/overcommit/hook/pre_commit/chamber_security_spec.rb
index ca4c9290..7badd189 100644
--- a/spec/overcommit/hook/pre_commit/chamber_security_spec.rb
+++ b/spec/overcommit/hook/pre_commit/chamber_security_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ChamberSecurity do
diff --git a/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb b/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb
index 1dee1de9..c3c35ede 100644
--- a/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb
+++ b/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ChamberVerification do
diff --git a/spec/overcommit/hook/pre_commit/coffee_lint_spec.rb b/spec/overcommit/hook/pre_commit/coffee_lint_spec.rb
index 44e00aca..5ece05f9 100644
--- a/spec/overcommit/hook/pre_commit/coffee_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/coffee_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::CoffeeLint do
diff --git a/spec/overcommit/hook/pre_commit/credo_spec.rb b/spec/overcommit/hook/pre_commit/credo_spec.rb
index c6de2514..0a97a0d6 100644
--- a/spec/overcommit/hook/pre_commit/credo_spec.rb
+++ b/spec/overcommit/hook/pre_commit/credo_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Credo do
diff --git a/spec/overcommit/hook/pre_commit/css_lint_spec.rb b/spec/overcommit/hook/pre_commit/css_lint_spec.rb
index 1f7133ed..4d2afc4d 100644
--- a/spec/overcommit/hook/pre_commit/css_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/css_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::CssLint do
diff --git a/spec/overcommit/hook/pre_commit/dogma_spec.rb b/spec/overcommit/hook/pre_commit/dogma_spec.rb
index 0e162ad3..53b5cd62 100644
--- a/spec/overcommit/hook/pre_commit/dogma_spec.rb
+++ b/spec/overcommit/hook/pre_commit/dogma_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Dogma do
diff --git a/spec/overcommit/hook/pre_commit/es_lint_spec.rb b/spec/overcommit/hook/pre_commit/es_lint_spec.rb
index e6cfd3fb..bcb2cfdc 100644
--- a/spec/overcommit/hook/pre_commit/es_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/es_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::EsLint do
diff --git a/spec/overcommit/hook/pre_commit/execute_permissions_spec.rb b/spec/overcommit/hook/pre_commit/execute_permissions_spec.rb
index 9e8da223..3e33b946 100644
--- a/spec/overcommit/hook/pre_commit/execute_permissions_spec.rb
+++ b/spec/overcommit/hook/pre_commit/execute_permissions_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ExecutePermissions do
diff --git a/spec/overcommit/hook/pre_commit/fasterer_spec.rb b/spec/overcommit/hook/pre_commit/fasterer_spec.rb
index c3fa6c85..405888ab 100644
--- a/spec/overcommit/hook/pre_commit/fasterer_spec.rb
+++ b/spec/overcommit/hook/pre_commit/fasterer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Fasterer do
diff --git a/spec/overcommit/hook/pre_commit/fix_me_spec.rb b/spec/overcommit/hook/pre_commit/fix_me_spec.rb
index 5fb8b8df..262c3294 100644
--- a/spec/overcommit/hook/pre_commit/fix_me_spec.rb
+++ b/spec/overcommit/hook/pre_commit/fix_me_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::FixMe do
diff --git a/spec/overcommit/hook/pre_commit/flay_spec.rb b/spec/overcommit/hook/pre_commit/flay_spec.rb
index e2b032da..a64cd2c3 100644
--- a/spec/overcommit/hook/pre_commit/flay_spec.rb
+++ b/spec/overcommit/hook/pre_commit/flay_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Flay do
diff --git a/spec/overcommit/hook/pre_commit/foodcritic_spec.rb b/spec/overcommit/hook/pre_commit/foodcritic_spec.rb
index 7fc2418a..2bbe3df2 100644
--- a/spec/overcommit/hook/pre_commit/foodcritic_spec.rb
+++ b/spec/overcommit/hook/pre_commit/foodcritic_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Foodcritic do
diff --git a/spec/overcommit/hook/pre_commit/forbidden_branches_spec.rb b/spec/overcommit/hook/pre_commit/forbidden_branches_spec.rb
index 3d068bda..abf6d4b3 100644
--- a/spec/overcommit/hook/pre_commit/forbidden_branches_spec.rb
+++ b/spec/overcommit/hook/pre_commit/forbidden_branches_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ForbiddenBranches do
diff --git a/spec/overcommit/hook/pre_commit/go_lint_spec.rb b/spec/overcommit/hook/pre_commit/go_lint_spec.rb
index b00bb8c6..399a65f2 100644
--- a/spec/overcommit/hook/pre_commit/go_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/go_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::GoLint do
diff --git a/spec/overcommit/hook/pre_commit/go_vet_spec.rb b/spec/overcommit/hook/pre_commit/go_vet_spec.rb
index 635039b2..69b89c4b 100644
--- a/spec/overcommit/hook/pre_commit/go_vet_spec.rb
+++ b/spec/overcommit/hook/pre_commit/go_vet_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::GoVet do
diff --git a/spec/overcommit/hook/pre_commit/hadolint_spec.rb b/spec/overcommit/hook/pre_commit/hadolint_spec.rb
index c8050f70..4091ca0b 100644
--- a/spec/overcommit/hook/pre_commit/hadolint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/hadolint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Hadolint do
diff --git a/spec/overcommit/hook/pre_commit/haml_lint_spec.rb b/spec/overcommit/hook/pre_commit/haml_lint_spec.rb
index adadb799..9eb15ee9 100644
--- a/spec/overcommit/hook/pre_commit/haml_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/haml_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::HamlLint do
diff --git a/spec/overcommit/hook/pre_commit/hard_tabs_spec.rb b/spec/overcommit/hook/pre_commit/hard_tabs_spec.rb
index 1bb662a9..3bee937d 100644
--- a/spec/overcommit/hook/pre_commit/hard_tabs_spec.rb
+++ b/spec/overcommit/hook/pre_commit/hard_tabs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::HardTabs do
diff --git a/spec/overcommit/hook/pre_commit/hlint_spec.rb b/spec/overcommit/hook/pre_commit/hlint_spec.rb
index 08183e18..7a87c427 100644
--- a/spec/overcommit/hook/pre_commit/hlint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/hlint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Hlint do
diff --git a/spec/overcommit/hook/pre_commit/html_hint_spec.rb b/spec/overcommit/hook/pre_commit/html_hint_spec.rb
index b96d8e14..66146d80 100644
--- a/spec/overcommit/hook/pre_commit/html_hint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/html_hint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::HtmlHint do
diff --git a/spec/overcommit/hook/pre_commit/html_tidy_spec.rb b/spec/overcommit/hook/pre_commit/html_tidy_spec.rb
index 389d38d0..77754bca 100644
--- a/spec/overcommit/hook/pre_commit/html_tidy_spec.rb
+++ b/spec/overcommit/hook/pre_commit/html_tidy_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::HtmlTidy do
diff --git a/spec/overcommit/hook/pre_commit/image_optim_spec.rb b/spec/overcommit/hook/pre_commit/image_optim_spec.rb
index 589344fb..7ac17ba5 100644
--- a/spec/overcommit/hook/pre_commit/image_optim_spec.rb
+++ b/spec/overcommit/hook/pre_commit/image_optim_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ImageOptim do
diff --git a/spec/overcommit/hook/pre_commit/java_checkstyle_spec.rb b/spec/overcommit/hook/pre_commit/java_checkstyle_spec.rb
index 072db68f..e06c724b 100644
--- a/spec/overcommit/hook/pre_commit/java_checkstyle_spec.rb
+++ b/spec/overcommit/hook/pre_commit/java_checkstyle_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::JavaCheckstyle do
diff --git a/spec/overcommit/hook/pre_commit/js_hint_spec.rb b/spec/overcommit/hook/pre_commit/js_hint_spec.rb
index 22c64eb5..4666c1af 100644
--- a/spec/overcommit/hook/pre_commit/js_hint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/js_hint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::JsHint do
diff --git a/spec/overcommit/hook/pre_commit/js_lint_spec.rb b/spec/overcommit/hook/pre_commit/js_lint_spec.rb
index 3fde219a..3d85b80c 100644
--- a/spec/overcommit/hook/pre_commit/js_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/js_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::JsLint do
diff --git a/spec/overcommit/hook/pre_commit/jscs_spec.rb b/spec/overcommit/hook/pre_commit/jscs_spec.rb
index 9edd17de..ce03edb3 100644
--- a/spec/overcommit/hook/pre_commit/jscs_spec.rb
+++ b/spec/overcommit/hook/pre_commit/jscs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Jscs do
diff --git a/spec/overcommit/hook/pre_commit/jsl_spec.rb b/spec/overcommit/hook/pre_commit/jsl_spec.rb
index c8eb53e2..51fdd998 100644
--- a/spec/overcommit/hook/pre_commit/jsl_spec.rb
+++ b/spec/overcommit/hook/pre_commit/jsl_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Jsl do
diff --git a/spec/overcommit/hook/pre_commit/json_syntax_spec.rb b/spec/overcommit/hook/pre_commit/json_syntax_spec.rb
index f456c081..0ee4a57e 100644
--- a/spec/overcommit/hook/pre_commit/json_syntax_spec.rb
+++ b/spec/overcommit/hook/pre_commit/json_syntax_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 
diff --git a/spec/overcommit/hook/pre_commit/kt_lint_spec.rb b/spec/overcommit/hook/pre_commit/kt_lint_spec.rb
index 2912151f..6ea89467 100644
--- a/spec/overcommit/hook/pre_commit/kt_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/kt_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::KtLint do
diff --git a/spec/overcommit/hook/pre_commit/license_finder_spec.rb b/spec/overcommit/hook/pre_commit/license_finder_spec.rb
index a1c9267e..ef0c8f5a 100644
--- a/spec/overcommit/hook/pre_commit/license_finder_spec.rb
+++ b/spec/overcommit/hook/pre_commit/license_finder_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::LicenseFinder do
diff --git a/spec/overcommit/hook/pre_commit/license_header_spec.rb b/spec/overcommit/hook/pre_commit/license_header_spec.rb
index 06cef9dc..ce454fab 100644
--- a/spec/overcommit/hook/pre_commit/license_header_spec.rb
+++ b/spec/overcommit/hook/pre_commit/license_header_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::LicenseHeader do
diff --git a/spec/overcommit/hook/pre_commit/line_endings_spec.rb b/spec/overcommit/hook/pre_commit/line_endings_spec.rb
index 8e2d4599..bcb576d9 100644
--- a/spec/overcommit/hook/pre_commit/line_endings_spec.rb
+++ b/spec/overcommit/hook/pre_commit/line_endings_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::LineEndings do
diff --git a/spec/overcommit/hook/pre_commit/local_paths_in_gemfile_spec.rb b/spec/overcommit/hook/pre_commit/local_paths_in_gemfile_spec.rb
index f6c3755c..ff0109ff 100644
--- a/spec/overcommit/hook/pre_commit/local_paths_in_gemfile_spec.rb
+++ b/spec/overcommit/hook/pre_commit/local_paths_in_gemfile_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::LocalPathsInGemfile do
diff --git a/spec/overcommit/hook/pre_commit/mdl_spec.rb b/spec/overcommit/hook/pre_commit/mdl_spec.rb
index c7da4478..dc2aa6cd 100644
--- a/spec/overcommit/hook/pre_commit/mdl_spec.rb
+++ b/spec/overcommit/hook/pre_commit/mdl_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Mdl do
diff --git a/spec/overcommit/hook/pre_commit/merge_conflicts_spec.rb b/spec/overcommit/hook/pre_commit/merge_conflicts_spec.rb
index 8d1747e0..f7790fe9 100644
--- a/spec/overcommit/hook/pre_commit/merge_conflicts_spec.rb
+++ b/spec/overcommit/hook/pre_commit/merge_conflicts_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::MergeConflicts do
diff --git a/spec/overcommit/hook/pre_commit/nginx_test_spec.rb b/spec/overcommit/hook/pre_commit/nginx_test_spec.rb
index cff2f699..b13ad8ef 100644
--- a/spec/overcommit/hook/pre_commit/nginx_test_spec.rb
+++ b/spec/overcommit/hook/pre_commit/nginx_test_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::NginxTest do
diff --git a/spec/overcommit/hook/pre_commit/pep257_spec.rb b/spec/overcommit/hook/pre_commit/pep257_spec.rb
index 65dddb90..2210c650 100644
--- a/spec/overcommit/hook/pre_commit/pep257_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pep257_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pep257 do
diff --git a/spec/overcommit/hook/pre_commit/pep8_spec.rb b/spec/overcommit/hook/pre_commit/pep8_spec.rb
index 6916073c..f3e01947 100644
--- a/spec/overcommit/hook/pre_commit/pep8_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pep8_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pep8 do
diff --git a/spec/overcommit/hook/pre_commit/php_lint_spec.rb b/spec/overcommit/hook/pre_commit/php_lint_spec.rb
index 7f2203dd..aff0b97e 100644
--- a/spec/overcommit/hook/pre_commit/php_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/php_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PhpLint do
diff --git a/spec/overcommit/hook/pre_commit/php_stan_spec.rb b/spec/overcommit/hook/pre_commit/php_stan_spec.rb
index 58e004c4..a4272fd6 100644
--- a/spec/overcommit/hook/pre_commit/php_stan_spec.rb
+++ b/spec/overcommit/hook/pre_commit/php_stan_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PhpStan do
diff --git a/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb b/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb
index 86fe8bc7..33b0d7c1 100644
--- a/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb
+++ b/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PhpCsFixer do
diff --git a/spec/overcommit/hook/pre_commit/phpcs_spec.rb b/spec/overcommit/hook/pre_commit/phpcs_spec.rb
index f480e071..3df6cfb5 100644
--- a/spec/overcommit/hook/pre_commit/phpcs_spec.rb
+++ b/spec/overcommit/hook/pre_commit/phpcs_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PhpCs do
diff --git a/spec/overcommit/hook/pre_commit/pronto_spec.rb b/spec/overcommit/hook/pre_commit/pronto_spec.rb
index 635435bc..ed099ace 100644
--- a/spec/overcommit/hook/pre_commit/pronto_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pronto_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pronto do
diff --git a/spec/overcommit/hook/pre_commit/puppet_lint_spec.rb b/spec/overcommit/hook/pre_commit/puppet_lint_spec.rb
index 94a0fa7e..518f06e2 100644
--- a/spec/overcommit/hook/pre_commit/puppet_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/puppet_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PuppetLint do
diff --git a/spec/overcommit/hook/pre_commit/puppet_metadata_json_lint_spec.rb b/spec/overcommit/hook/pre_commit/puppet_metadata_json_lint_spec.rb
index 43da8eb7..1edeb21b 100644
--- a/spec/overcommit/hook/pre_commit/puppet_metadata_json_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/puppet_metadata_json_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PuppetMetadataJsonLint do
diff --git a/spec/overcommit/hook/pre_commit/pycodestyle_spec.rb b/spec/overcommit/hook/pre_commit/pycodestyle_spec.rb
index b579c276..609388a0 100644
--- a/spec/overcommit/hook/pre_commit/pycodestyle_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pycodestyle_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pycodestyle do
diff --git a/spec/overcommit/hook/pre_commit/pydocstyle_spec.rb b/spec/overcommit/hook/pre_commit/pydocstyle_spec.rb
index b043eafe..2fb61038 100644
--- a/spec/overcommit/hook/pre_commit/pydocstyle_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pydocstyle_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pydocstyle do
diff --git a/spec/overcommit/hook/pre_commit/pyflakes_spec.rb b/spec/overcommit/hook/pre_commit/pyflakes_spec.rb
index a503d1aa..fd913155 100644
--- a/spec/overcommit/hook/pre_commit/pyflakes_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pyflakes_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pyflakes do
diff --git a/spec/overcommit/hook/pre_commit/pylint_spec.rb b/spec/overcommit/hook/pre_commit/pylint_spec.rb
index b8b3159d..b0368d6a 100644
--- a/spec/overcommit/hook/pre_commit/pylint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pylint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Pylint do
diff --git a/spec/overcommit/hook/pre_commit/python_flake8_spec.rb b/spec/overcommit/hook/pre_commit/python_flake8_spec.rb
index 10016a00..a4bb1109 100644
--- a/spec/overcommit/hook/pre_commit/python_flake8_spec.rb
+++ b/spec/overcommit/hook/pre_commit/python_flake8_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::PythonFlake8 do
diff --git a/spec/overcommit/hook/pre_commit/rails_best_practices_spec.rb b/spec/overcommit/hook/pre_commit/rails_best_practices_spec.rb
index 686538f2..6e451f25 100644
--- a/spec/overcommit/hook/pre_commit/rails_best_practices_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rails_best_practices_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::RailsBestPractices do
diff --git a/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb b/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb
index 0046b3b2..ad53485e 100644
--- a/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::RailsSchemaUpToDate do
diff --git a/spec/overcommit/hook/pre_commit/rake_target_spec.rb b/spec/overcommit/hook/pre_commit/rake_target_spec.rb
index 5c0f01e9..4a0cf400 100644
--- a/spec/overcommit/hook/pre_commit/rake_target_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rake_target_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::RakeTarget do
diff --git a/spec/overcommit/hook/pre_commit/reek_spec.rb b/spec/overcommit/hook/pre_commit/reek_spec.rb
index 7d72ebfa..8e111e7c 100644
--- a/spec/overcommit/hook/pre_commit/reek_spec.rb
+++ b/spec/overcommit/hook/pre_commit/reek_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Reek do
diff --git a/spec/overcommit/hook/pre_commit/rst_lint_spec.rb b/spec/overcommit/hook/pre_commit/rst_lint_spec.rb
index 891247a6..ed9edbf8 100644
--- a/spec/overcommit/hook/pre_commit/rst_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rst_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::RstLint do
diff --git a/spec/overcommit/hook/pre_commit/rubo_cop_spec.rb b/spec/overcommit/hook/pre_commit/rubo_cop_spec.rb
index 4a3d25d5..f06c8d1d 100644
--- a/spec/overcommit/hook/pre_commit/rubo_cop_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rubo_cop_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::RuboCop do
diff --git a/spec/overcommit/hook/pre_commit/ruby_lint_spec.rb b/spec/overcommit/hook/pre_commit/ruby_lint_spec.rb
index 0d0d8780..062a3296 100644
--- a/spec/overcommit/hook/pre_commit/ruby_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/ruby_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::RubyLint do
diff --git a/spec/overcommit/hook/pre_commit/scalariform_spec.rb b/spec/overcommit/hook/pre_commit/scalariform_spec.rb
index 2d258678..cb24df97 100644
--- a/spec/overcommit/hook/pre_commit/scalariform_spec.rb
+++ b/spec/overcommit/hook/pre_commit/scalariform_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Scalariform do
diff --git a/spec/overcommit/hook/pre_commit/scalastyle_spec.rb b/spec/overcommit/hook/pre_commit/scalastyle_spec.rb
index a42dc4f3..90e44d4c 100644
--- a/spec/overcommit/hook/pre_commit/scalastyle_spec.rb
+++ b/spec/overcommit/hook/pre_commit/scalastyle_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Scalastyle do
diff --git a/spec/overcommit/hook/pre_commit/scss_lint_spec.rb b/spec/overcommit/hook/pre_commit/scss_lint_spec.rb
index 2880f565..ae8b2f68 100644
--- a/spec/overcommit/hook/pre_commit/scss_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/scss_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ScssLint do
diff --git a/spec/overcommit/hook/pre_commit/semi_standard_spec.rb b/spec/overcommit/hook/pre_commit/semi_standard_spec.rb
index 1e967e4c..cc69025a 100644
--- a/spec/overcommit/hook/pre_commit/semi_standard_spec.rb
+++ b/spec/overcommit/hook/pre_commit/semi_standard_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::SemiStandard do
diff --git a/spec/overcommit/hook/pre_commit/shell_check_spec.rb b/spec/overcommit/hook/pre_commit/shell_check_spec.rb
index 22cb9e78..f9fba49c 100644
--- a/spec/overcommit/hook/pre_commit/shell_check_spec.rb
+++ b/spec/overcommit/hook/pre_commit/shell_check_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::ShellCheck do
diff --git a/spec/overcommit/hook/pre_commit/slim_lint_spec.rb b/spec/overcommit/hook/pre_commit/slim_lint_spec.rb
index 7d4e57d1..3485c226 100644
--- a/spec/overcommit/hook/pre_commit/slim_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/slim_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::SlimLint do
diff --git a/spec/overcommit/hook/pre_commit/sqlint_spec.rb b/spec/overcommit/hook/pre_commit/sqlint_spec.rb
index 11bcec60..bc9edec2 100644
--- a/spec/overcommit/hook/pre_commit/sqlint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/sqlint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Sqlint do
diff --git a/spec/overcommit/hook/pre_commit/standard_spec.rb b/spec/overcommit/hook/pre_commit/standard_spec.rb
index 16150285..c382e61d 100644
--- a/spec/overcommit/hook/pre_commit/standard_spec.rb
+++ b/spec/overcommit/hook/pre_commit/standard_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Standard do
diff --git a/spec/overcommit/hook/pre_commit/stylelint_spec.rb b/spec/overcommit/hook/pre_commit/stylelint_spec.rb
index bb5381c6..3f619a25 100644
--- a/spec/overcommit/hook/pre_commit/stylelint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/stylelint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Stylelint do
diff --git a/spec/overcommit/hook/pre_commit/swift_lint_spec.rb b/spec/overcommit/hook/pre_commit/swift_lint_spec.rb
index 4da00f8c..d2fb78fd 100644
--- a/spec/overcommit/hook/pre_commit/swift_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/swift_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::SwiftLint do
diff --git a/spec/overcommit/hook/pre_commit/trailing_whitespace_spec.rb b/spec/overcommit/hook/pre_commit/trailing_whitespace_spec.rb
index c7d8c84a..af94b7f9 100644
--- a/spec/overcommit/hook/pre_commit/trailing_whitespace_spec.rb
+++ b/spec/overcommit/hook/pre_commit/trailing_whitespace_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::TrailingWhitespace do
diff --git a/spec/overcommit/hook/pre_commit/travis_lint_spec.rb b/spec/overcommit/hook/pre_commit/travis_lint_spec.rb
index c0cea2a9..0a6e5624 100644
--- a/spec/overcommit/hook/pre_commit/travis_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/travis_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::TravisLint do
diff --git a/spec/overcommit/hook/pre_commit/ts_lint_spec.rb b/spec/overcommit/hook/pre_commit/ts_lint_spec.rb
index 7c3b0aa0..6cc8e55b 100644
--- a/spec/overcommit/hook/pre_commit/ts_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/ts_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::TsLint do
diff --git a/spec/overcommit/hook/pre_commit/vint_spec.rb b/spec/overcommit/hook/pre_commit/vint_spec.rb
index e4d6d504..c884d655 100644
--- a/spec/overcommit/hook/pre_commit/vint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/vint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::Vint do
diff --git a/spec/overcommit/hook/pre_commit/w3c_css_spec.rb b/spec/overcommit/hook/pre_commit/w3c_css_spec.rb
index d69cf484..9ec45800 100644
--- a/spec/overcommit/hook/pre_commit/w3c_css_spec.rb
+++ b/spec/overcommit/hook/pre_commit/w3c_css_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::W3cCss do
diff --git a/spec/overcommit/hook/pre_commit/w3c_html_spec.rb b/spec/overcommit/hook/pre_commit/w3c_html_spec.rb
index 7c3b612f..e517bb34 100644
--- a/spec/overcommit/hook/pre_commit/w3c_html_spec.rb
+++ b/spec/overcommit/hook/pre_commit/w3c_html_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::W3cHtml do
diff --git a/spec/overcommit/hook/pre_commit/xml_lint_spec.rb b/spec/overcommit/hook/pre_commit/xml_lint_spec.rb
index 967e6964..dc48df40 100644
--- a/spec/overcommit/hook/pre_commit/xml_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/xml_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::XmlLint do
diff --git a/spec/overcommit/hook/pre_commit/xml_syntax_spec.rb b/spec/overcommit/hook/pre_commit/xml_syntax_spec.rb
index 1a086792..d2a31c05 100644
--- a/spec/overcommit/hook/pre_commit/xml_syntax_spec.rb
+++ b/spec/overcommit/hook/pre_commit/xml_syntax_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'rexml/document'
 
diff --git a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
index 2709fe12..72ebc6e8 100644
--- a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::YamlLint do
diff --git a/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb b/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb
index 54ae727b..29cb7b02 100644
--- a/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::YamlSyntax do
diff --git a/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb b/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb
index dc6f8b04..d59779c9 100644
--- a/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::YardCoverage do
diff --git a/spec/overcommit/hook/pre_commit/yarn_check_spec.rb b/spec/overcommit/hook/pre_commit/yarn_check_spec.rb
index 247f37bc..f67fa9b2 100644
--- a/spec/overcommit/hook/pre_commit/yarn_check_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yarn_check_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::YarnCheck do
diff --git a/spec/overcommit/hook/pre_push/brakeman_spec.rb b/spec/overcommit/hook/pre_push/brakeman_spec.rb
index 056652d0..c8dad7f0 100644
--- a/spec/overcommit/hook/pre_push/brakeman_spec.rb
+++ b/spec/overcommit/hook/pre_push/brakeman_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::Brakeman do
diff --git a/spec/overcommit/hook/pre_push/cargo_test_spec.rb b/spec/overcommit/hook/pre_push/cargo_test_spec.rb
index eeef7b2e..a21c96dc 100644
--- a/spec/overcommit/hook/pre_push/cargo_test_spec.rb
+++ b/spec/overcommit/hook/pre_push/cargo_test_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::CargoTest do
diff --git a/spec/overcommit/hook/pre_push/minitest_spec.rb b/spec/overcommit/hook/pre_push/minitest_spec.rb
index dde67e55..566fbce1 100644
--- a/spec/overcommit/hook/pre_push/minitest_spec.rb
+++ b/spec/overcommit/hook/pre_push/minitest_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::Minitest do
diff --git a/spec/overcommit/hook/pre_push/php_unit_spec.rb b/spec/overcommit/hook/pre_push/php_unit_spec.rb
index 5c8bf0cc..4373fefa 100644
--- a/spec/overcommit/hook/pre_push/php_unit_spec.rb
+++ b/spec/overcommit/hook/pre_push/php_unit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::PhpUnit do
diff --git a/spec/overcommit/hook/pre_push/protected_branches_spec.rb b/spec/overcommit/hook/pre_push/protected_branches_spec.rb
index e94ce35e..92a27d07 100644
--- a/spec/overcommit/hook/pre_push/protected_branches_spec.rb
+++ b/spec/overcommit/hook/pre_push/protected_branches_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/pre_push'
 
diff --git a/spec/overcommit/hook/pre_push/pytest_spec.rb b/spec/overcommit/hook/pre_push/pytest_spec.rb
index cb13ba28..796f0f74 100644
--- a/spec/overcommit/hook/pre_push/pytest_spec.rb
+++ b/spec/overcommit/hook/pre_push/pytest_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::Pytest do
diff --git a/spec/overcommit/hook/pre_push/python_nose_spec.rb b/spec/overcommit/hook/pre_push/python_nose_spec.rb
index 24f98dab..c91644cb 100644
--- a/spec/overcommit/hook/pre_push/python_nose_spec.rb
+++ b/spec/overcommit/hook/pre_push/python_nose_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::PythonNose do
diff --git a/spec/overcommit/hook/pre_push/r_spec_spec.rb b/spec/overcommit/hook/pre_push/r_spec_spec.rb
index 7e30d785..26f6ea0f 100644
--- a/spec/overcommit/hook/pre_push/r_spec_spec.rb
+++ b/spec/overcommit/hook/pre_push/r_spec_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::RSpec do
diff --git a/spec/overcommit/hook/pre_push/rake_target_spec.rb b/spec/overcommit/hook/pre_push/rake_target_spec.rb
index 05b3c299..45c93752 100644
--- a/spec/overcommit/hook/pre_push/rake_target_spec.rb
+++ b/spec/overcommit/hook/pre_push/rake_target_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::RakeTarget do
diff --git a/spec/overcommit/hook/pre_push/test_unit_spec.rb b/spec/overcommit/hook/pre_push/test_unit_spec.rb
index 701a62ea..bf5f444a 100644
--- a/spec/overcommit/hook/pre_push/test_unit_spec.rb
+++ b/spec/overcommit/hook/pre_push/test_unit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PrePush::TestUnit do
diff --git a/spec/overcommit/hook/pre_rebase/merged_commits_spec.rb b/spec/overcommit/hook/pre_rebase/merged_commits_spec.rb
index 72cdaff2..acab0138 100644
--- a/spec/overcommit/hook/pre_rebase/merged_commits_spec.rb
+++ b/spec/overcommit/hook/pre_rebase/merged_commits_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Hook::PreRebase::MergedCommits do
diff --git a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
index fffa2a43..616d6b8e 100644
--- a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/prepare_commit_msg'
 
diff --git a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
index ad3fd2d0..ae66962c 100644
--- a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/prepare_commit_msg'
 
diff --git a/spec/overcommit/hook_context/base_spec.rb b/spec/overcommit/hook_context/base_spec.rb
index d5028379..7b72c12e 100644
--- a/spec/overcommit/hook_context/base_spec.rb
+++ b/spec/overcommit/hook_context/base_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::HookContext::Base do
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb
index ac11aa90..0e6535c2 100644
--- a/spec/overcommit/hook_context/commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/commit_msg_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/commit_msg'
 
diff --git a/spec/overcommit/hook_context/post_checkout_spec.rb b/spec/overcommit/hook_context/post_checkout_spec.rb
index a9b928a7..50657c37 100644
--- a/spec/overcommit/hook_context/post_checkout_spec.rb
+++ b/spec/overcommit/hook_context/post_checkout_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/post_checkout'
 
diff --git a/spec/overcommit/hook_context/post_commit_spec.rb b/spec/overcommit/hook_context/post_commit_spec.rb
index c9f8b9c7..81758256 100644
--- a/spec/overcommit/hook_context/post_commit_spec.rb
+++ b/spec/overcommit/hook_context/post_commit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/post_commit'
 
diff --git a/spec/overcommit/hook_context/post_merge_spec.rb b/spec/overcommit/hook_context/post_merge_spec.rb
index cce17afc..aa89fa82 100644
--- a/spec/overcommit/hook_context/post_merge_spec.rb
+++ b/spec/overcommit/hook_context/post_merge_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/post_merge'
 
diff --git a/spec/overcommit/hook_context/post_rewrite_spec.rb b/spec/overcommit/hook_context/post_rewrite_spec.rb
index e26dc207..d2f18f6e 100644
--- a/spec/overcommit/hook_context/post_rewrite_spec.rb
+++ b/spec/overcommit/hook_context/post_rewrite_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/post_rewrite'
 
diff --git a/spec/overcommit/hook_context/pre_commit_spec.rb b/spec/overcommit/hook_context/pre_commit_spec.rb
index 17a481a8..8e489962 100644
--- a/spec/overcommit/hook_context/pre_commit_spec.rb
+++ b/spec/overcommit/hook_context/pre_commit_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/pre_commit'
 
diff --git a/spec/overcommit/hook_context/pre_push_spec.rb b/spec/overcommit/hook_context/pre_push_spec.rb
index e8306ad2..a8706e04 100644
--- a/spec/overcommit/hook_context/pre_push_spec.rb
+++ b/spec/overcommit/hook_context/pre_push_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/pre_push'
 
diff --git a/spec/overcommit/hook_context/pre_rebase_spec.rb b/spec/overcommit/hook_context/pre_rebase_spec.rb
index 1d800cc5..58e0e8c2 100644
--- a/spec/overcommit/hook_context/pre_rebase_spec.rb
+++ b/spec/overcommit/hook_context/pre_rebase_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/pre_rebase'
 
diff --git a/spec/overcommit/hook_context/prepare_commit_msg_spec.rb b/spec/overcommit/hook_context/prepare_commit_msg_spec.rb
index 9371fe6c..4e4c017b 100644
--- a/spec/overcommit/hook_context/prepare_commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/prepare_commit_msg_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/prepare_commit_msg'
 
diff --git a/spec/overcommit/hook_context/run_all_spec.rb b/spec/overcommit/hook_context/run_all_spec.rb
index d5b0963b..516fb70b 100644
--- a/spec/overcommit/hook_context/run_all_spec.rb
+++ b/spec/overcommit/hook_context/run_all_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'overcommit/hook_context/run_all'
 
diff --git a/spec/overcommit/hook_signer_spec.rb b/spec/overcommit/hook_signer_spec.rb
index 2b2805c7..98862fd0 100644
--- a/spec/overcommit/hook_signer_spec.rb
+++ b/spec/overcommit/hook_signer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::HookSigner do
diff --git a/spec/overcommit/installer_spec.rb b/spec/overcommit/installer_spec.rb
index 622dab43..c7cfb05e 100644
--- a/spec/overcommit/installer_spec.rb
+++ b/spec/overcommit/installer_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Installer do
diff --git a/spec/overcommit/logger_spec.rb b/spec/overcommit/logger_spec.rb
index dbd927b9..681e0dff 100644
--- a/spec/overcommit/logger_spec.rb
+++ b/spec/overcommit/logger_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::Logger do
diff --git a/spec/overcommit/message_processor_spec.rb b/spec/overcommit/message_processor_spec.rb
index dec604d3..f90a1f0f 100644
--- a/spec/overcommit/message_processor_spec.rb
+++ b/spec/overcommit/message_processor_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Overcommit::MessageProcessor do
diff --git a/spec/overcommit/utils_spec.rb b/spec/overcommit/utils_spec.rb
index 76272cdb..eeb53802 100644
--- a/spec/overcommit/utils_spec.rb
+++ b/spec/overcommit/utils_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'securerandom'
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9070aef4..f0d93a7f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV['TRAVIS']
   # When running in Travis, report coverage stats to Coveralls.
   require 'coveralls'
diff --git a/spec/support/git_spec_helpers.rb b/spec/support/git_spec_helpers.rb
index 25b0b520..23e46c51 100644
--- a/spec/support/git_spec_helpers.rb
+++ b/spec/support/git_spec_helpers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 
 # Helpers for creating temporary repositories and directories for testing.
diff --git a/spec/support/matchers/hook.rb b/spec/support/matchers/hook.rb
index 21eecca2..80fbd33b 100644
--- a/spec/support/matchers/hook.rb
+++ b/spec/support/matchers/hook.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # General spec matcher logic for checking hook status and output.
 class HookMatcher
   def initialize(status, args)
diff --git a/spec/support/normalize_indent.rb b/spec/support/normalize_indent.rb
index bef3f5c3..4276d12c 100644
--- a/spec/support/normalize_indent.rb
+++ b/spec/support/normalize_indent.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Strips off excess leading indentation from each line so we can use Heredocs
 # for writing code without having the leading indentation count.
 module IndentNormalizer
diff --git a/spec/support/output_helpers.rb b/spec/support/output_helpers.rb
index 63ad8d2a..5364204a 100644
--- a/spec/support/output_helpers.rb
+++ b/spec/support/output_helpers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Helpers for capturing output streams in tests.
 module OutputHelpers
   module_function
diff --git a/spec/support/shell_helpers.rb b/spec/support/shell_helpers.rb
index 9051621a..e543bc37 100644
--- a/spec/support/shell_helpers.rb
+++ b/spec/support/shell_helpers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timeout'
 require 'overcommit/subprocess'
 
diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/commit-msg
+++ b/template-dir/hooks/commit-msg
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/overcommit-hook
+++ b/template-dir/hooks/overcommit-hook
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/post-checkout
+++ b/template-dir/hooks/post-checkout
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/post-commit
+++ b/template-dir/hooks/post-commit
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/post-merge
+++ b/template-dir/hooks/post-merge
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/post-rewrite
+++ b/template-dir/hooks/post-rewrite
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/pre-commit
+++ b/template-dir/hooks/pre-commit
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/pre-push
+++ b/template-dir/hooks/pre-push
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/pre-rebase
+++ b/template-dir/hooks/pre-rebase
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
index b345d9c7..8b8c118c 100755
--- a/template-dir/hooks/prepare-commit-msg
+++ b/template-dir/hooks/prepare-commit-msg
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

From 28c4d3d5e3f1c52967de167b5aca8d0591327b3a Mon Sep 17 00:00:00 2001
From: Kevin McCormack <harlemsquirrel@gmail.com>
Date: Mon, 5 Nov 2018 07:30:41 -0500
Subject: [PATCH 011/223] Do not use safe navigation for Ruby < 2.3

---
 lib/overcommit/configuration_validator.rb      | 18 ++++++++++++------
 .../hook_context/prepare_commit_msg.rb         |  2 +-
 lib/overcommit/utils.rb                        |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/overcommit/configuration_validator.rb b/lib/overcommit/configuration_validator.rb
index 77357c05..3b04a06e 100644
--- a/lib/overcommit/configuration_validator.rb
+++ b/lib/overcommit/configuration_validator.rb
@@ -84,8 +84,10 @@ def check_hook_env(hash)
       end
 
       if errors.any?
-        @log&.error errors.join("\n")
-        @log&.newline
+        if @log
+          @log.error errors.join("\n")
+          @log.newline
+        end
         raise Overcommit::Exceptions::ConfigurationError,
               'One or more hooks had an invalid `env` configuration option'
       end
@@ -109,8 +111,10 @@ def check_hook_name_format(hash)
       end
 
       if errors.any?
-        @log&.error errors.join("\n")
-        @log&.newline
+        if @log
+          @log.error errors.join("\n")
+          @log.newline
+        end
         raise Overcommit::Exceptions::ConfigurationError,
               'One or more hooks had invalid names'
       end
@@ -156,8 +160,10 @@ def check_for_too_many_processors(config, hash)
       end
 
       if errors.any?
-        @log&.error errors.join("\n")
-        @log&.newline
+        if @log
+          @log.error errors.join("\n")
+          @log.newline
+        end
         raise Overcommit::Exceptions::ConfigurationError,
               'One or more hooks had invalid `processor` value configured'
       end
diff --git a/lib/overcommit/hook_context/prepare_commit_msg.rb b/lib/overcommit/hook_context/prepare_commit_msg.rb
index 781fab73..13342ed8 100644
--- a/lib/overcommit/hook_context/prepare_commit_msg.rb
+++ b/lib/overcommit/hook_context/prepare_commit_msg.rb
@@ -16,7 +16,7 @@ def commit_message_filename
     # exists); or commit, followed by a commit SHA-1 (if a -c, -C or --amend
     # option was given)
     def commit_message_source
-      @args[1]&.to_sym
+      @args[1].to_sym if @args[1]
     end
 
     # Returns the commit's SHA-1.
diff --git a/lib/overcommit/utils.rb b/lib/overcommit/utils.rb
index d99fa0d4..2174e431 100644
--- a/lib/overcommit/utils.rb
+++ b/lib/overcommit/utils.rb
@@ -297,7 +297,7 @@ def matches_path?(pattern, path)
       #
       # @param args [Array<String>]
       def debug(*args)
-        log&.debug(*args)
+        log.debug(*args) if log
       end
     end
   end

From f8a27d6c973a12df6f0281848b10a6f6cdaa982f Mon Sep 17 00:00:00 2001
From: Kevin McCormack <harlemsquirrel@gmail.com>
Date: Fri, 9 Nov 2018 09:04:04 -0500
Subject: [PATCH 012/223] Rubocop fixes

- Add back `.freeze` on contstants for Ruby 2.2
---
 .rubocop.yml                                      |  2 +-
 lib/overcommit/configuration_validator.rb         |  4 ++--
 lib/overcommit/constants.rb                       |  6 +++---
 lib/overcommit/hook/pre_commit/berksfile_check.rb |  2 +-
 lib/overcommit/hook/pre_commit/bundle_audit.rb    |  2 +-
 lib/overcommit/hook/pre_commit/bundle_check.rb    |  2 +-
 lib/overcommit/hook/pre_commit/bundle_outdated.rb |  2 +-
 lib/overcommit/hook/pre_commit/yarn_check.rb      |  2 +-
 lib/overcommit/hook_context/pre_commit.rb         |  4 ++--
 lib/overcommit/message_processor.rb               | 12 ++++++------
 lib/overcommit/version.rb                         |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index bdc196db..1d95f9d4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.2
 
 Layout/ClosingParenthesisIndentation:
   Enabled: false
diff --git a/lib/overcommit/configuration_validator.rb b/lib/overcommit/configuration_validator.rb
index 3b04a06e..1c88fda0 100644
--- a/lib/overcommit/configuration_validator.rb
+++ b/lib/overcommit/configuration_validator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ClassLength, Metrics/MethodLength, Metrics/LineLength
+# rubocop:disable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength
 module Overcommit
   # Validates and normalizes a configuration.
   class ConfigurationValidator
@@ -183,4 +183,4 @@ def check_for_verify_plugin_signatures_option(hash)
     end
   end
 end
-# rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/LineLength
+# rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength
diff --git a/lib/overcommit/constants.rb b/lib/overcommit/constants.rb
index 69ba6658..ff2c9311 100644
--- a/lib/overcommit/constants.rb
+++ b/lib/overcommit/constants.rb
@@ -3,10 +3,10 @@
 # Global application constants.
 module Overcommit
   HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
-  CONFIG_FILE_NAME = '.overcommit.yml'
+  CONFIG_FILE_NAME = '.overcommit.yml'.freeze
 
   HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 
-  REPO_URL = 'https://github.com/brigade/overcommit'
-  BUG_REPORT_URL = "#{REPO_URL}/issues"
+  REPO_URL = 'https://github.com/brigade/overcommit'.freeze
+  BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
 end
diff --git a/lib/overcommit/hook/pre_commit/berksfile_check.rb b/lib/overcommit/hook/pre_commit/berksfile_check.rb
index a8040976..80049e2d 100644
--- a/lib/overcommit/hook/pre_commit/berksfile_check.rb
+++ b/lib/overcommit/hook/pre_commit/berksfile_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://berkshelf.com/
   class BerksfileCheck < Base
-    LOCK_FILE = 'Berksfile.lock'
+    LOCK_FILE = 'Berksfile.lock'.freeze
 
     def run
       # Ignore if Berksfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_audit.rb b/lib/overcommit/hook/pre_commit/bundle_audit.rb
index 465cc3c8..3f8e8ee4 100644
--- a/lib/overcommit/hook/pre_commit/bundle_audit.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_audit.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/rubysec/bundler-audit
   class BundleAudit < Base
-    LOCK_FILE = 'Gemfile.lock'
+    LOCK_FILE = 'Gemfile.lock'.freeze
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_check.rb b/lib/overcommit/hook/pre_commit/bundle_check.rb
index 10d30d2c..6d433da2 100644
--- a/lib/overcommit/hook/pre_commit/bundle_check.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/
   class BundleCheck < Base
-    LOCK_FILE = 'Gemfile.lock'
+    LOCK_FILE = 'Gemfile.lock'.freeze
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_outdated.rb b/lib/overcommit/hook/pre_commit/bundle_outdated.rb
index afa36c23..6ec4ede6 100644
--- a/lib/overcommit/hook/pre_commit/bundle_outdated.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_outdated.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/bundle_outdated.html
   class BundleOutdated < Base
-    LOCK_FILE = 'Gemfile.lock'
+    LOCK_FILE = 'Gemfile.lock'.freeze
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/yarn_check.rb b/lib/overcommit/hook/pre_commit/yarn_check.rb
index f51402d3..aa3a0414 100644
--- a/lib/overcommit/hook/pre_commit/yarn_check.rb
+++ b/lib/overcommit/hook/pre_commit/yarn_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://yarnpkg.com/en/docs/cli/check
   class YarnCheck < Base
-    LOCK_FILE = 'yarn.lock'
+    LOCK_FILE = 'yarn.lock'.freeze
 
     # A lot of the errors returned by `yarn check` are outside the developer's control
     # (are caused by bad package specification, in the hands of the upstream maintainer)
diff --git a/lib/overcommit/hook_context/pre_commit.rb b/lib/overcommit/hook_context/pre_commit.rb
index ffd55914..00c2872d 100644
--- a/lib/overcommit/hook_context/pre_commit.rb
+++ b/lib/overcommit/hook_context/pre_commit.rb
@@ -21,8 +21,8 @@ def amendment?
       # containing unicode characters, we replace the offending characters,
       # since the pattern we're looking for will consist of ASCII characters
       unless cmd.valid_encoding?
-        cmd = Overcommit::Utils.parent_command.encode('UTF-16be', invalid: :replace, replace: '?')
-                               .encode('UTF-8')
+        cmd = Overcommit::Utils.parent_command.encode('UTF-16be', invalid: :replace, replace: '?').
+                                               encode('UTF-8')
       end
 
       return @amendment if
diff --git a/lib/overcommit/message_processor.rb b/lib/overcommit/message_processor.rb
index c1bedf96..eac9fb00 100644
--- a/lib/overcommit/message_processor.rb
+++ b/lib/overcommit/message_processor.rb
@@ -8,12 +8,12 @@ module Overcommit
   # output tuple from an array of {Overcommit::Hook::Message}s, respecting the
   # configuration settings for the given hook.
   class MessageProcessor
-    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'
-    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'
-    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:"
-    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:"
-    ERRORS_GENERIC_HEADER = 'Errors:'
-    WARNINGS_GENERIC_HEADER = 'Warnings:'
+    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'.freeze
+    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'.freeze
+    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:".freeze
+    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:".freeze
+    ERRORS_GENERIC_HEADER = 'Errors:'.freeze
+    WARNINGS_GENERIC_HEADER = 'Warnings:'.freeze
 
     # @param hook [Overcommit::Hook::Base]
     # @param unmodified_lines_setting [String] how to treat messages on
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 541af57d..49954888 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.46.0'
+  VERSION = '0.46.0'.freeze
 end

From 797f989186edad8d5ddbe78e14716243c0a2f2b9 Mon Sep 17 00:00:00 2001
From: Kevin McCormack <harlemsquirrel@gmail.com>
Date: Sun, 28 Oct 2018 14:29:09 -0400
Subject: [PATCH 013/223] Use Hash#fetch with block

According to fasterer, "Hash#fetch with second argument
is slower than Hash#fetch with block"
---
 lib/overcommit/configuration.rb                      |  8 ++++----
 lib/overcommit/configuration_loader.rb               |  2 +-
 lib/overcommit/configuration_validator.rb            | 12 ++++++------
 lib/overcommit/hook/base.rb                          |  8 ++++----
 .../hook/pre_commit/chamber_verification.rb          |  2 +-
 lib/overcommit/logger.rb                             |  2 +-
 lib/overcommit/utils.rb                              |  2 +-
 spec/support/shell_helpers.rb                        |  4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/overcommit/configuration.rb b/lib/overcommit/configuration.rb
index 9e0716d1..ae3efa50 100644
--- a/lib/overcommit/configuration.rb
+++ b/lib/overcommit/configuration.rb
@@ -43,7 +43,7 @@ def concurrency
       @concurrency ||=
         begin
           cores = Overcommit::Utils.processor_count
-          content = @hash.fetch('concurrency', '%<processors>d')
+          content = @hash.fetch('concurrency') { '%<processors>d' }
           if content.is_a?(String)
             concurrency_expr = content % { processors: cores }
 
@@ -156,7 +156,7 @@ def merge(config)
     # environment variables.
     def apply_environment!(hook_context, env)
       skipped_hooks = "#{env['SKIP']} #{env['SKIP_CHECKS']} #{env['SKIP_HOOKS']}".split(/[:, ]/)
-      only_hooks = env.fetch('ONLY', '').split(/[:, ]/)
+      only_hooks = env.fetch('ONLY') { '' }.split(/[:, ]/)
       hook_type = hook_context.hook_class_name
 
       if only_hooks.any? || skipped_hooks.include?('all') || skipped_hooks.include?('ALL')
@@ -254,7 +254,7 @@ def update_signature!
     private
 
     def ad_hoc_hook?(hook_context, hook_name)
-      ad_hoc_conf = @hash.fetch(hook_context.hook_class_name, {}).fetch(hook_name, {})
+      ad_hoc_conf = @hash.fetch(hook_context.hook_class_name) { {} }.fetch(hook_name) { {} }
 
       # Ad hoc hooks are neither built-in nor have a plugin file written but
       # still have a `command` specified to be run
@@ -284,7 +284,7 @@ def hook_enabled?(hook_context_or_type, hook_name)
           hook_context_or_type.hook_class_name
         end
 
-      individual_enabled = @hash[hook_type].fetch(hook_name, {})['enabled']
+      individual_enabled = @hash[hook_type].fetch(hook_name) { {} }['enabled']
       return individual_enabled unless individual_enabled.nil?
 
       all_enabled = @hash[hook_type]['ALL']['enabled']
diff --git a/lib/overcommit/configuration_loader.rb b/lib/overcommit/configuration_loader.rb
index f4946320..f884c41d 100644
--- a/lib/overcommit/configuration_loader.rb
+++ b/lib/overcommit/configuration_loader.rb
@@ -65,7 +65,7 @@ def load_file(file)
       config = self.class.load_from_file(file, default: false, logger: @log)
       config = self.class.default_configuration.merge(config)
 
-      if @options.fetch(:verify, config.verify_signatures?)
+      if @options.fetch(:verify) { config.verify_signatures? }
         verify_signatures(config)
       end
 
diff --git a/lib/overcommit/configuration_validator.rb b/lib/overcommit/configuration_validator.rb
index 1c88fda0..902f3be8 100644
--- a/lib/overcommit/configuration_validator.rb
+++ b/lib/overcommit/configuration_validator.rb
@@ -59,8 +59,8 @@ def check_hook_env(hash)
       errors = []
 
       Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
-        hash.fetch(hook_type, {}).each do |hook_name, hook_config|
-          hook_env = hook_config.fetch('env', {})
+        hash.fetch(hook_type) { {} }.each do |hook_name, hook_config|
+          hook_env = hook_config.fetch('env') { {} }
 
           unless hook_env.is_a?(Hash)
             errors << "#{hook_type}::#{hook_name} has an invalid `env` specified: " \
@@ -99,7 +99,7 @@ def check_hook_name_format(hash)
       errors = []
 
       Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
-        hash.fetch(hook_type, {}).each_key do |hook_name|
+        hash.fetch(hook_type) { {} }.each_key do |hook_name|
           next if hook_name == 'ALL'
 
           unless hook_name =~ /\A[A-Za-z0-9]+\z/
@@ -128,7 +128,7 @@ def check_for_missing_enabled_option(hash)
       any_warnings = false
 
       Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
-        hash.fetch(hook_type, {}).each do |hook_name, hook_config|
+        hash.fetch(hook_type) { {} }.each do |hook_name, hook_config|
           next if hook_name == 'ALL'
 
           if hook_config['enabled'].nil?
@@ -149,8 +149,8 @@ def check_for_too_many_processors(config, hash)
 
       errors = []
       Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
-        hash.fetch(hook_type, {}).each do |hook_name, hook_config|
-          processors = hook_config.fetch('processors', 1)
+        hash.fetch(hook_type) { {} }.each do |hook_name, hook_config|
+          processors = hook_config.fetch('processors') { 1 }
           if processors > concurrency
             errors << "#{hook_type}::#{hook_name} `processors` value " \
                       "(#{processors}) is larger than the global `concurrency` " \
diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index b24e7e50..6ba69d75 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -44,7 +44,7 @@ def run_and_transform
       if output = check_for_requirements
         status = :fail
       else
-        result = Overcommit::Utils.with_environment(@config.fetch('env', {})) { run }
+        result = Overcommit::Utils.with_environment(@config.fetch('env') { {} }) { run }
         status, output = process_hook_return_value(result)
       end
 
@@ -68,7 +68,7 @@ def parallelize?
     end
 
     def processors
-      @config.fetch('processors', 1)
+      @config.fetch('processors') { 1 }
     end
 
     def quiet?
@@ -272,9 +272,9 @@ def process_hook_return_value(hook_return_value)
     def transform_status(status)
       case status
       when :fail
-        @config.fetch('on_fail', :fail).to_sym
+        @config.fetch('on_fail') { :fail }.to_sym
       when :warn
-        @config.fetch('on_warn', :warn).to_sym
+        @config.fetch('on_warn') { :warn }.to_sym
       else
         status
       end
diff --git a/lib/overcommit/hook/pre_commit/chamber_verification.rb b/lib/overcommit/hook/pre_commit/chamber_verification.rb
index 3114b632..8581c063 100644
--- a/lib/overcommit/hook/pre_commit/chamber_verification.rb
+++ b/lib/overcommit/hook/pre_commit/chamber_verification.rb
@@ -7,7 +7,7 @@ module Overcommit::Hook::PreCommit
   # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
   class ChamberVerification < Base
     def run
-      approver_name  = config.fetch('approver_name', 'your approver')
+      approver_name  = config.fetch('approver_name') { 'your approver' }
       approver_email = config['approver_email'] ? " (#{config['approver_email']})" : nil
 
       result = execute(command)
diff --git a/lib/overcommit/logger.rb b/lib/overcommit/logger.rb
index 99fc43f7..a9ff793c 100644
--- a/lib/overcommit/logger.rb
+++ b/lib/overcommit/logger.rb
@@ -40,7 +40,7 @@ def log(*args)
 
     # Write a line of output if debug mode is enabled.
     def debug(*args)
-      color('35', *args) unless ENV.fetch('OVERCOMMIT_DEBUG', '').empty?
+      color('35', *args) unless ENV.fetch('OVERCOMMIT_DEBUG') { '' }.empty?
     end
 
     # Write a line of output that is intended to be emphasized.
diff --git a/lib/overcommit/utils.rb b/lib/overcommit/utils.rb
index 2174e431..cbd4cebb 100644
--- a/lib/overcommit/utils.rb
+++ b/lib/overcommit/utils.rb
@@ -174,7 +174,7 @@ def execute(initial_args, options = {})
         end
 
         result =
-          if (splittable_args = options.fetch(:args, [])).any?
+          if (splittable_args = options.fetch(:args) { [] }).any?
             debug(initial_args.join(' ') + " ... (#{splittable_args.length} splittable args)")
             Overcommit::CommandSplitter.execute(initial_args, options)
           else
diff --git a/spec/support/shell_helpers.rb b/spec/support/shell_helpers.rb
index e543bc37..d035e13a 100644
--- a/spec/support/shell_helpers.rb
+++ b/spec/support/shell_helpers.rb
@@ -23,10 +23,10 @@ def touch(file)
   # @param options [Hash]
   # @raise [Timeout::TimeoutError] timeout has elapsed before condition holds
   def wait_until(options = {})
-    Timeout.timeout(options.fetch(:timeout, 1)) do
+    Timeout.timeout(options.fetch(:timeout) { 1 }) do
       loop do
         return if yield
-        sleep options.fetch(:check_interval, 0.1)
+        sleep options.fetch(:check_interval) { 0.1 }
       end
     end
   end

From 44f866c80ba118054773c6c9c4a72a665de8206b Mon Sep 17 00:00:00 2001
From: Jeff Wallace <jeff@tjwallace.ca>
Date: Tue, 8 Jan 2019 09:22:56 -0800
Subject: [PATCH 014/223] Add --force-exclusion flag to default Reek config

Similar to the flag provided by Rubocop, the --force-exclusion flag ensures files excluded via the exclude_paths config option are still excluded when they are explicitly passed to the reek command.
---
 config/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index a196c50a..b388f130 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -619,7 +619,7 @@ PreCommit:
     enabled: false
     description: 'Analyze with Reek'
     required_executable: 'reek'
-    flags: ['--single-line', '--no-color']
+    flags: ['--single-line', '--no-color', '--force-exclusion']
     install_command: 'gem install reek'
     include:
       - '**/*.gemspec'

From 8895a79fd53486259a9fa0738fc902c18d0d513e Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Mon, 7 Jan 2019 13:59:11 +0100
Subject: [PATCH 015/223] CI: Include Ruby 2.6.0 in build matrix

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 785041a8..cb5080e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ rvm:
   - 2.3.7
   - 2.4.4
   - 2.5.1
+  - 2.6
 
 before_script:
   - git config --global user.email "travis@travis.ci"
@@ -16,7 +17,7 @@ before_script:
 
 before_install:
   - gem update --system
-  - gem install bundler
+  - gem install bundler:'< 2'
 
 script:
   - bundle exec rspec

From e5f061974d97ffaf2d1c6a8d9e64cc539bb0fafc Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Mon, 7 Jan 2019 14:08:22 +0100
Subject: [PATCH 016/223] AppVeyor: Bundler less than 2

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index e1873591..a54e12a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -39,7 +39,7 @@ install:
   - where gem
 
   # Install latest Bundler to work around version issues
-  - gem install bundler --force
+  - gem install bundler:'< 2' --force
   - where bundler
 
   # Install ruby dependencies

From e74ca8cea24ef5fcb914f5517a0998d32c2436fd Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Mon, 7 Jan 2019 14:09:34 +0100
Subject: [PATCH 017/223] AppVeyor: Extend the CI matrix

---
 appveyor.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index a54e12a0..d46cb4e5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,12 @@ environment:
     - RUBY_FOLDER_VERSION: "22-x64"
     - RUBY_FOLDER_VERSION: "23"
     - RUBY_FOLDER_VERSION: "23-x64"
-
+    - RUBY_FOLDER_VERSION: "24"
+    - RUBY_FOLDER_VERSION: "24-x64"
+    - RUBY_FOLDER_VERSION: "25"
+    - RUBY_FOLDER_VERSION: "25-x64"
+    - RUBY_FOLDER_VERSION: "26"
+    - RUBY_FOLDER_VERSION: "26-x64"
 matrix:
   fast_finish: true
 

From 15a8b4b50f018d338388fc873d6381c0a137f535 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Tue, 8 Jan 2019 13:20:08 +0100
Subject: [PATCH 018/223] CI: Make an exception for ruby-2.2

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cb5080e3..66526a25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,13 @@ before_script:
   - git config --global user.name "Travis CI"
 
 before_install:
-  - gem update --system
+  - |
+    export RVM_CURRENT=`rvm current`
+    if [ "${RVM_CURRENT}" != "ruby-2.2.7" ]; then
+      gem --version
+    else
+      gem update --system
+    fi
   - gem install bundler:'< 2'
 
 script:

From 39afc00a1b080b38010c3962e1b3fe35b7d2ce4e Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Tue, 8 Jan 2019 13:21:50 +0100
Subject: [PATCH 019/223] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 66526a25..51d51fd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_script:
 before_install:
   - |
     export RVM_CURRENT=`rvm current`
-    if [ "${RVM_CURRENT}" != "ruby-2.2.7" ]; then
+    if [ "${RVM_CURRENT}" == "ruby-2.2.7" ]; then
       gem --version
     else
       gem update --system

From 5692b4e9d58c5e587928f528f6df66df903a2a6f Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Tue, 8 Jan 2019 13:37:21 +0100
Subject: [PATCH 020/223] CI: rvm current|cut -c6-8

  - This is to make an exception for Ruby 2.2.x
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51d51fd6..52fd354d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ before_script:
 
 before_install:
   - |
-    export RVM_CURRENT=`rvm current`
-    if [ "${RVM_CURRENT}" == "ruby-2.2.7" ]; then
+    export RVM_CURRENT=`rvm current|cut -c6-8`
+    if [ "${RVM_CURRENT}" == "2.2" ]; then
       gem --version
     else
       gem update --system

From dcf8c38a504b9efe21fe661325e3e99da89a6d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Surov=C4=8D=C3=A1k?= <martin@surovcak.cz>
Date: Thu, 7 Feb 2019 00:20:58 +0100
Subject: [PATCH 021/223] trivial: fix yaml indent

---
 config/default.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/default.yml b/config/default.yml
index b388f130..29188310 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -738,11 +738,11 @@ PreCommit:
     include: '**/*.swift'
 
   TsLint:
-      enabled: false
-      description: 'Analyze with TSLint'
-      required_executable: 'tslint'
-      install_command: 'npm install -g tslint typescript'
-      include: '**/*.ts'
+    enabled: false
+    description: 'Analyze with TSLint'
+    required_executable: 'tslint'
+    install_command: 'npm install -g tslint typescript'
+    include: '**/*.ts'
 
   TrailingWhitespace:
     enabled: false

From 3050cb664bed5fa4ca8104d2d20e8a5b0342b2c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Surov=C4=8D=C3=A1k?= <martin@surovcak.cz>
Date: Thu, 7 Feb 2019 00:19:13 +0100
Subject: [PATCH 022/223] Introduce Terraform pre-commit Hook

Simply check terraform fmt.

Fixes #567
---
 config/default.yml                            |  7 ++++
 .../hook/pre_commit/terraform_format.rb       | 19 ++++++++++
 .../hook/pre_commit/terraform_format_spec.rb  | 38 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/terraform_format.rb
 create mode 100644 spec/overcommit/hook/pre_commit/terraform_format_spec.rb

diff --git a/config/default.yml b/config/default.yml
index 29188310..41a1d4b4 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -737,6 +737,13 @@ PreCommit:
     install_command: 'brew install swiftlint'
     include: '**/*.swift'
 
+  TerraformFormat:
+    enabled: false
+    description: 'Analyze with Terraform'
+    required_executable: 'terraform'
+    flags: ['fmt', '-check=true', '-diff=false']
+    include: '**/*.tf'
+
   TsLint:
     enabled: false
     description: 'Analyze with TSLint'
diff --git a/lib/overcommit/hook/pre_commit/terraform_format.rb b/lib/overcommit/hook/pre_commit/terraform_format.rb
new file mode 100644
index 00000000..905a55eb
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/terraform_format.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs 'terraform fmt' against any modified *.tf files.
+  #
+  # @see https://www.terraform.io/docs/commands/fmt.html
+  class TerraformFormat < Base
+    def run
+      messages = []
+      applicable_files.each do |f|
+        result = execute(command, args: [f])
+        unless result.success?
+          messages << Overcommit::Hook::Message.new(:error, f, nil, "violation found in #{f}")
+        end
+      end
+      messages
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/terraform_format_spec.rb b/spec/overcommit/hook/pre_commit/terraform_format_spec.rb
new file mode 100644
index 00000000..6897f8c3
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/terraform_format_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::TerraformFormat do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.tf file2.tf])
+  end
+
+  context 'when Terraform exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when Terraform exits unsucessfully' do
+    let(:result_ok) { double('result') }
+    let(:result_bad) { double('result') }
+    let(:cmdline) { %w[terraform fmt -check=true -diff=false] }
+
+    before do
+      result_ok.stub(:success?).and_return(true)
+      result_bad.stub(:success?).and_return(false)
+      subject.stub(:execute).with(cmdline, args: ['file1.tf']).and_return(result_ok)
+      subject.stub(:execute).with(cmdline, args: ['file2.tf']).and_return(result_bad)
+    end
+
+    it { should fail_hook }
+  end
+end

From d160e37aab94fc64981d604ddae8b3a5a594e5bd Mon Sep 17 00:00:00 2001
From: Thomas Holt <tholt@salesforce.com>
Date: Tue, 19 Feb 2019 15:12:32 -0500
Subject: [PATCH 023/223] add cookstyle support to fix #617

---
 config/default.yml                           | 12 ++++++-
 lib/overcommit/hook/pre_commit/cook_style.rb | 35 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 lib/overcommit/hook/pre_commit/cook_style.rb

diff --git a/config/default.yml b/config/default.yml
index 41a1d4b4..b675705c 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -230,7 +230,17 @@ PreCommit:
     install_command: 'npm install -g coffeelint'
     include: '**/*.coffee'
 
-  Credo:
+   CookStyle:
+    enabled: false
+    description: 'Analyze with CookStyle'
+    required_executable: 'cookstyle'
+    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names']
+    install_command: 'gem install cookstyle'
+    include:
+      - '**/*.rb'
+      - '**/*.erb'
+
+   Credo:
     enabled: false
     description: 'Analyze with credo'
     required_executable: 'mix'
diff --git a/lib/overcommit/hook/pre_commit/cook_style.rb b/lib/overcommit/hook/pre_commit/cook_style.rb
new file mode 100644
index 00000000..afa480cb
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/cook_style.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `cookstyle` against any modified Chef Ruby files.
+  #
+  # @see https://docs.chef.io/cookstyle.html
+  class CookStyle < Base
+    GENERIC_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type =~ /^warn/ ? :warning : :error
+    end
+
+    COP_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.include?('W') ? :warning : :error
+    end
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      generic_messages = extract_messages(
+        result.stderr.split("\n"),
+        /^(?<type>[a-z]+)/i,
+        GENERIC_MESSAGE_TYPE_CATEGORIZER,
+      )
+
+      cop_messages = extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):[^ ]+ (?<type>[^ ]+)/,
+        COP_MESSAGE_TYPE_CATEGORIZER,
+      )
+
+      generic_messages + cop_messages
+    end
+  end
+end

From 577fde94f860fb380c111fa815696aa1d2f531ed Mon Sep 17 00:00:00 2001
From: Thomas Holt <tholt@salesforce.com>
Date: Wed, 20 Feb 2019 13:39:23 -0500
Subject: [PATCH 024/223] fixed indenting

---
 config/default.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/default.yml b/config/default.yml
index b675705c..3a1877bc 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -230,7 +230,7 @@ PreCommit:
     install_command: 'npm install -g coffeelint'
     include: '**/*.coffee'
 
-   CookStyle:
+  CookStyle:
     enabled: false
     description: 'Analyze with CookStyle'
     required_executable: 'cookstyle'
@@ -240,7 +240,7 @@ PreCommit:
       - '**/*.rb'
       - '**/*.erb'
 
-   Credo:
+  Credo:
     enabled: false
     description: 'Analyze with credo'
     required_executable: 'mix'

From 49ee54649ea77d29f028fd04815e4905183e2e32 Mon Sep 17 00:00:00 2001
From: Thomas Holt <tholt@salesforce.com>
Date: Mon, 25 Feb 2019 08:10:52 -0500
Subject: [PATCH 025/223] added cookstyle unit test

---
 .../hook/pre_commit/cook_style_spec.rb        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 spec/overcommit/hook/pre_commit/cook_style_spec.rb

diff --git a/spec/overcommit/hook/pre_commit/cook_style_spec.rb b/spec/overcommit/hook/pre_commit/cook_style_spec.rb
new file mode 100644
index 00000000..a37678da
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/cook_style_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::CookStyle do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.rb file2.rb])
+  end
+
+  context 'when cookstyle exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(success?: true, stderr: '', stdout: '')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when cookstyle exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should fail_hook }
+  end
+end

From 7b3e85084c75522ab4e684dd59c7dabb7a9a1456 Mon Sep 17 00:00:00 2001
From: Thomas Holt <tholt@salesforce.com>
Date: Mon, 25 Feb 2019 09:12:44 -0500
Subject: [PATCH 026/223] Reverted to more like rubocop tests

---
 .../hook/pre_commit/cook_style_spec.rb        | 69 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/spec/overcommit/hook/pre_commit/cook_style_spec.rb b/spec/overcommit/hook/pre_commit/cook_style_spec.rb
index a37678da..a7dece87 100644
--- a/spec/overcommit/hook/pre_commit/cook_style_spec.rb
+++ b/spec/overcommit/hook/pre_commit/cook_style_spec.rb
@@ -20,6 +20,18 @@
     end
 
     it { should pass }
+
+    context 'and it printed warnings to stderr' do
+      before do
+        result.stub(:stderr).and_return(normalize_indent(<<-MSG))
+          warning: parser/current is loading parser/ruby21, which recognizes
+          warning: 2.1.8-compliant syntax, but you are running 2.1.1.
+          warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.
+        MSG
+      end
+
+      it { should pass }
+    end
   end
 
   context 'when cookstyle exits unsucessfully' do
@@ -30,6 +42,61 @@
       subject.stub(:execute).and_return(result)
     end
 
-    it { should fail_hook }
+    context 'and it reports a warning' do
+      before do
+        result.stub(:stdout).and_return([
+          'file1.rb:1:1: W: Useless assignment to variable - my_var.',
+        ].join("\n"))
+        result.stub(:stderr).and_return('')
+      end
+
+      it { should warn }
+
+      context 'and it printed warnings to stderr' do
+        before do
+          result.stub(:stderr).and_return(normalize_indent(<<-MSG))
+            warning: parser/current is loading parser/ruby21, which recognizes
+            warning: 2.1.8-compliant syntax, but you are running 2.1.1.
+            warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.
+          MSG
+        end
+
+        it { should warn }
+      end
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return([
+          'file1.rb:1:1: C: Missing top-level class documentation',
+        ].join("\n"))
+        result.stub(:stderr).and_return('')
+      end
+
+      it { should fail_hook }
+
+      context 'and it printed warnings to stderr' do
+        before do
+          result.stub(:stderr).and_return(normalize_indent(<<-MSG))
+            warning: parser/current is loading parser/ruby21, which recognizes
+            warning: 2.1.8-compliant syntax, but you are running 2.1.1.
+            warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.
+          MSG
+        end
+
+        it { should fail_hook }
+      end
+    end
+
+    context 'when a generic error message is written to stderr' do
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return([
+          'Could not find cookstyle in any of the sources'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
   end
 end

From 255147435437a051b9bbfee38d0dbbfb119c1432 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Sat, 16 Mar 2019 14:31:38 +0100
Subject: [PATCH 027/223] CI: Drop unused option "sudo: false"

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52fd354d..d45c5080 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: ruby
 
-sudo: false
-
 cache: bundler
 
 rvm:

From 15f4ef455222a93fb5d8a82a30db127b4acccf78 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 16 Mar 2019 17:35:46 -0700
Subject: [PATCH 028/223] Fix Ruby builds

The --no-ri flag wasn't recognized on Ruby 2.3 since later versions of
RubyGems are available for that version (RubyGems 3.0.0+).

Remove Ruby 2.2 build (since it is EOL as of June 2018) while we're
here.
---
 appveyor.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d46cb4e5..ef25794e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,8 +4,6 @@ clone_depth: 1
 
 environment:
   matrix:
-    - RUBY_FOLDER_VERSION: "22"
-    - RUBY_FOLDER_VERSION: "22-x64"
     - RUBY_FOLDER_VERSION: "23"
     - RUBY_FOLDER_VERSION: "23-x64"
     - RUBY_FOLDER_VERSION: "24"
@@ -39,7 +37,7 @@ install:
   - where ruby
 
   # Install latest version of RubyGems
-  - gem update --system --no-ri --no-rdoc
+  - gem update --system --no-document
   - gem --version
   - where gem
 

From 7f9c425cd7d7c05f0cb7dd8d05963ed935e2d4f2 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 16 Mar 2019 17:38:37 -0700
Subject: [PATCH 029/223] Disable BrokenSymlink pre-commit hook for this repo

The AppVeyor testing environment has failures when running this
particular hook in a 64-bit environment. This isn't worth the time to
investigate, so disable the hook for now.

Example build failure:
https://ci.appveyor.com/project/brigade/overcommit/build/job/u45ju8kf8swoj1rw
---
 .overcommit.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.overcommit.yml b/.overcommit.yml
index 501a51c5..adb9505d 100644
--- a/.overcommit.yml
+++ b/.overcommit.yml
@@ -1,6 +1,10 @@
 gemfile: Gemfile
 
 PreCommit:
+  # Disabled since this causes spurious failures on AppVeyor builds
+  BrokenSymlinks:
+    enabled: false
+
   BundleCheck:
     enabled: true
 

From 69fffeba6e740364e69cae84910e6974372e83a9 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 23 Mar 2019 16:38:10 -0700
Subject: [PATCH 030/223] Update change log

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e4f1ec2..fb93d2e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+### New Features
+
+* Add support for `prepare-commit-message` hooks
+* Add [`SwiftLint`](https://github.com/realm/SwiftLint) pre-commit hook
+* Add [`KtLint`](https://github.com/shyiko/ktlint) pre-commit hook
+* Add `TerraformFormat` pre-commit hook
+* Add [`CookStyle`](https://docs.chef.io/cookstyle.html) pre-commit hook
+
+### Changes
+
+* Update `validator_uri` for `W3cHtml` pre-commit hook
+* Update `TsLint` pre-commit hook to support new output format
+* Update `BundleCheck` error message with additional instructions
+
+### Bug Fixes
+
+* Add `--force-exclusion` flag to `Reek` pre-commit hook configuration to
+  ensure excluded files are excluded
+
 ## 0.46.0
 
 * Fix `Credo` pre-commit hook to lint applicable files only rather than

From 29b431f426c5fdb19b9b82a13e81eb74ab4ba2d3 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 23 Mar 2019 16:40:33 -0700
Subject: [PATCH 031/223] Cut version 0.47.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb93d2e9..ad52cdc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.47.0
 
 ### New Features
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 49954888..3ff2b285 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.46.0'.freeze
+  VERSION = '0.47.0'.freeze
 end

From 19812b525bf63c6d86b45e6a8f4ee19a15f356f7 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 23 Mar 2019 17:00:59 -0700
Subject: [PATCH 032/223] Drop support for Ruby 2.2

Ruby 2.2 has been EOL since June 2018. Supporting it requires additional
effort in our test environment, so drop support.
---
 .rubocop.yml       |  2 +-
 .travis.yml        | 19 ++++++-------------
 README.md          |  2 +-
 overcommit.gemspec |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1d95f9d4..bdc196db 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
 
 Layout/ClosingParenthesisIndentation:
   Enabled: false
diff --git a/.travis.yml b/.travis.yml
index d45c5080..189d6398 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,25 +3,18 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.2
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - 2.6
+  - 2.3.8
+  - 2.4.5
+  - 2.5.5
+  - 2.6.2
 
 before_script:
   - git config --global user.email "travis@travis.ci"
   - git config --global user.name "Travis CI"
 
 before_install:
-  - |
-    export RVM_CURRENT=`rvm current|cut -c6-8`
-    if [ "${RVM_CURRENT}" == "2.2" ]; then
-      gem --version
-    else
-      gem update --system
-    fi
-  - gem install bundler:'< 2'
+  - gem update --system
+  - gem install bundler
 
 script:
   - bundle exec rspec
diff --git a/README.md b/README.md
index 7205fcc1..0317d30c 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ any Ruby code.
 
 This project aims to support the following Ruby runtimes on both \*nix and Windows:
 
-* MRI 2.2+
+* MRI 2.3+
 
 ### Dependencies
 
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 4c3dd07e..56312641 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
                             Dir['libexec/**/*'] +
                             Dir['template-dir/**/*']
 
-  s.required_ruby_version = '>= 2.2'
+  s.required_ruby_version = '>= 2.3'
 
   s.add_dependency          'childprocess', '~> 0.6', '>= 0.6.3'
   s.add_dependency          'iniparse', '~> 1.4'

From 7a0a80903a9ad9419c8effb44f19376e7e0dcb07 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 23 Mar 2019 17:03:40 -0700
Subject: [PATCH 033/223] Remove unnecessary `freeze` calls on literal strings

Now that we no longer support Ruby 2.2, we can remove these redundant
`freeze` calls since we specify `frozen_string_literal` at the top of
these files.
---
 lib/overcommit/constants.rb                       |  6 +++---
 lib/overcommit/hook/pre_commit/berksfile_check.rb |  2 +-
 lib/overcommit/hook/pre_commit/bundle_audit.rb    |  2 +-
 lib/overcommit/hook/pre_commit/bundle_check.rb    |  2 +-
 lib/overcommit/hook/pre_commit/bundle_outdated.rb |  2 +-
 lib/overcommit/hook/pre_commit/yarn_check.rb      |  2 +-
 lib/overcommit/hook_context/prepare_commit_msg.rb |  2 +-
 lib/overcommit/message_processor.rb               | 12 ++++++------
 lib/overcommit/utils.rb                           |  2 +-
 lib/overcommit/version.rb                         |  2 +-
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/overcommit/constants.rb b/lib/overcommit/constants.rb
index ff2c9311..69ba6658 100644
--- a/lib/overcommit/constants.rb
+++ b/lib/overcommit/constants.rb
@@ -3,10 +3,10 @@
 # Global application constants.
 module Overcommit
   HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
-  CONFIG_FILE_NAME = '.overcommit.yml'.freeze
+  CONFIG_FILE_NAME = '.overcommit.yml'
 
   HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 
-  REPO_URL = 'https://github.com/brigade/overcommit'.freeze
-  BUG_REPORT_URL = "#{REPO_URL}/issues".freeze
+  REPO_URL = 'https://github.com/brigade/overcommit'
+  BUG_REPORT_URL = "#{REPO_URL}/issues"
 end
diff --git a/lib/overcommit/hook/pre_commit/berksfile_check.rb b/lib/overcommit/hook/pre_commit/berksfile_check.rb
index 80049e2d..a8040976 100644
--- a/lib/overcommit/hook/pre_commit/berksfile_check.rb
+++ b/lib/overcommit/hook/pre_commit/berksfile_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://berkshelf.com/
   class BerksfileCheck < Base
-    LOCK_FILE = 'Berksfile.lock'.freeze
+    LOCK_FILE = 'Berksfile.lock'
 
     def run
       # Ignore if Berksfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_audit.rb b/lib/overcommit/hook/pre_commit/bundle_audit.rb
index 3f8e8ee4..465cc3c8 100644
--- a/lib/overcommit/hook/pre_commit/bundle_audit.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_audit.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/rubysec/bundler-audit
   class BundleAudit < Base
-    LOCK_FILE = 'Gemfile.lock'.freeze
+    LOCK_FILE = 'Gemfile.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_check.rb b/lib/overcommit/hook/pre_commit/bundle_check.rb
index 6d433da2..10d30d2c 100644
--- a/lib/overcommit/hook/pre_commit/bundle_check.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/
   class BundleCheck < Base
-    LOCK_FILE = 'Gemfile.lock'.freeze
+    LOCK_FILE = 'Gemfile.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/bundle_outdated.rb b/lib/overcommit/hook/pre_commit/bundle_outdated.rb
index 6ec4ede6..afa36c23 100644
--- a/lib/overcommit/hook/pre_commit/bundle_outdated.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_outdated.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/bundle_outdated.html
   class BundleOutdated < Base
-    LOCK_FILE = 'Gemfile.lock'.freeze
+    LOCK_FILE = 'Gemfile.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git
diff --git a/lib/overcommit/hook/pre_commit/yarn_check.rb b/lib/overcommit/hook/pre_commit/yarn_check.rb
index aa3a0414..f51402d3 100644
--- a/lib/overcommit/hook/pre_commit/yarn_check.rb
+++ b/lib/overcommit/hook/pre_commit/yarn_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://yarnpkg.com/en/docs/cli/check
   class YarnCheck < Base
-    LOCK_FILE = 'yarn.lock'.freeze
+    LOCK_FILE = 'yarn.lock'
 
     # A lot of the errors returned by `yarn check` are outside the developer's control
     # (are caused by bad package specification, in the hands of the upstream maintainer)
diff --git a/lib/overcommit/hook_context/prepare_commit_msg.rb b/lib/overcommit/hook_context/prepare_commit_msg.rb
index 13342ed8..781fab73 100644
--- a/lib/overcommit/hook_context/prepare_commit_msg.rb
+++ b/lib/overcommit/hook_context/prepare_commit_msg.rb
@@ -16,7 +16,7 @@ def commit_message_filename
     # exists); or commit, followed by a commit SHA-1 (if a -c, -C or --amend
     # option was given)
     def commit_message_source
-      @args[1].to_sym if @args[1]
+      @args[1]&.to_sym
     end
 
     # Returns the commit's SHA-1.
diff --git a/lib/overcommit/message_processor.rb b/lib/overcommit/message_processor.rb
index eac9fb00..c1bedf96 100644
--- a/lib/overcommit/message_processor.rb
+++ b/lib/overcommit/message_processor.rb
@@ -8,12 +8,12 @@ module Overcommit
   # output tuple from an array of {Overcommit::Hook::Message}s, respecting the
   # configuration settings for the given hook.
   class MessageProcessor
-    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'.freeze
-    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'.freeze
-    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:".freeze
-    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:".freeze
-    ERRORS_GENERIC_HEADER = 'Errors:'.freeze
-    WARNINGS_GENERIC_HEADER = 'Warnings:'.freeze
+    ERRORS_MODIFIED_HEADER = 'Errors on modified lines:'
+    WARNINGS_MODIFIED_HEADER = 'Warnings on modified lines:'
+    ERRORS_UNMODIFIED_HEADER = "Errors on lines you didn't modify:"
+    WARNINGS_UNMODIFIED_HEADER = "Warnings on lines you didn't modify:"
+    ERRORS_GENERIC_HEADER = 'Errors:'
+    WARNINGS_GENERIC_HEADER = 'Warnings:'
 
     # @param hook [Overcommit::Hook::Base]
     # @param unmodified_lines_setting [String] how to treat messages on
diff --git a/lib/overcommit/utils.rb b/lib/overcommit/utils.rb
index cbd4cebb..cac63d57 100644
--- a/lib/overcommit/utils.rb
+++ b/lib/overcommit/utils.rb
@@ -297,7 +297,7 @@ def matches_path?(pattern, path)
       #
       # @param args [Array<String>]
       def debug(*args)
-        log.debug(*args) if log
+        log&.debug(*args)
       end
     end
   end
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 3ff2b285..a0c6b11f 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.47.0'.freeze
+  VERSION = '0.47.0'
 end

From d4a7c9d63a29cdb8af2ffdfdf42e20393c34c986 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 23 Mar 2019 17:06:33 -0700
Subject: [PATCH 034/223] Update change log with Ruby 2.2 support removal

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad52cdc8..00cbef80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Drop support for Ruby 2.2
+
 ## 0.47.0
 
 ### New Features

From 764d9a1efb859602caaf4f0166215a39b8f59503 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 23 Mar 2019 17:14:54 -0700
Subject: [PATCH 035/223] Add missing frozen_string_literal directive

One of the files was missing this, after a report from RuboCop.
---
 .git-hooks/pre_commit/master_hooks_match.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.git-hooks/pre_commit/master_hooks_match.rb b/.git-hooks/pre_commit/master_hooks_match.rb
index f2b845a9..09a0e34b 100644
--- a/.git-hooks/pre_commit/master_hooks_match.rb
+++ b/.git-hooks/pre_commit/master_hooks_match.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Overcommit::Hook::PreCommit

From e1fea158b4ad7e8e129c4d20e4bd3a000e38ce93 Mon Sep 17 00:00:00 2001
From: Nico Ritsche <nico.ritsche@gmail.com>
Date: Thu, 28 Mar 2019 15:01:12 +0200
Subject: [PATCH 036/223] CommitMsg MessageFormat: multiline match

Add m flag to regexp check to allow matching over multiple lines.
---
 lib/overcommit/hook/commit_msg/message_format.rb |  2 +-
 .../hook/commit_msg/message_format_spec.rb       | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/commit_msg/message_format.rb b/lib/overcommit/hook/commit_msg/message_format.rb
index dda9fd9d..36fd729f 100644
--- a/lib/overcommit/hook/commit_msg/message_format.rb
+++ b/lib/overcommit/hook/commit_msg/message_format.rb
@@ -19,7 +19,7 @@ def validate_pattern(message)
       expected_pattern_message = config['expected_pattern_message']
       sample_message = config['sample_message']
 
-      unless message =~ /#{pattern}/
+      unless message =~ /#{pattern}/m
         [
           'Commit message pattern mismatch.',
           "Expected : #{expected_pattern_message}",
diff --git a/spec/overcommit/hook/commit_msg/message_format_spec.rb b/spec/overcommit/hook/commit_msg/message_format_spec.rb
index 5197e2b2..d4aaab62 100644
--- a/spec/overcommit/hook/commit_msg/message_format_spec.rb
+++ b/spec/overcommit/hook/commit_msg/message_format_spec.rb
@@ -39,4 +39,20 @@
 
     it { should fail_hook expected_message }
   end
+
+  context 'when multiline message matches the pattern' do
+    let(:config) do
+      super().merge(Overcommit::Configuration.new(
+        'CommitMsg' => {
+          'MessageFormat' => {
+            'pattern' => '^Some .* Message$'
+          }
+        }
+      ))
+    end
+
+    let(:commit_msg) { "Some \n multiline \n Message" }
+
+    it { should pass }
+  end
 end

From 496715ce3fe027c257584bba3ce5a38d0bd6e245 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 29 Mar 2019 15:20:30 +0100
Subject: [PATCH 037/223] Avoid YARD warning "RedundantBraces

---
 lib/overcommit/hook/post_checkout/bower_install.rb    | 2 +-
 lib/overcommit/hook/post_checkout/bundle_install.rb   | 2 +-
 lib/overcommit/hook/post_checkout/composer_install.rb | 2 +-
 lib/overcommit/hook/post_checkout/index_tags.rb       | 2 +-
 lib/overcommit/hook/post_checkout/npm_install.rb      | 2 +-
 lib/overcommit/hook/post_checkout/yarn_install.rb     | 2 +-
 lib/overcommit/hook/post_commit/bower_install.rb      | 2 +-
 lib/overcommit/hook/post_commit/bundle_install.rb     | 2 +-
 lib/overcommit/hook/post_commit/composer_install.rb   | 2 +-
 lib/overcommit/hook/post_commit/index_tags.rb         | 2 +-
 lib/overcommit/hook/post_commit/npm_install.rb        | 2 +-
 lib/overcommit/hook/post_commit/yarn_install.rb       | 2 +-
 lib/overcommit/hook/post_merge/bower_install.rb       | 2 +-
 lib/overcommit/hook/post_merge/bundle_install.rb      | 2 +-
 lib/overcommit/hook/post_merge/composer_install.rb    | 2 +-
 lib/overcommit/hook/post_merge/index_tags.rb          | 2 +-
 lib/overcommit/hook/post_merge/npm_install.rb         | 2 +-
 lib/overcommit/hook/post_merge/yarn_install.rb        | 2 +-
 lib/overcommit/hook/post_rewrite/bower_install.rb     | 2 +-
 lib/overcommit/hook/post_rewrite/bundle_install.rb    | 2 +-
 lib/overcommit/hook/post_rewrite/composer_install.rb  | 2 +-
 lib/overcommit/hook/post_rewrite/index_tags.rb        | 2 +-
 lib/overcommit/hook/post_rewrite/npm_install.rb       | 2 +-
 lib/overcommit/hook/post_rewrite/yarn_install.rb      | 2 +-
 lib/overcommit/hook/pre_commit/rake_target.rb         | 2 +-
 lib/overcommit/hook/pre_push/rake_target.rb           | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/lib/overcommit/hook/post_checkout/bower_install.rb b/lib/overcommit/hook/post_checkout/bower_install.rb
index 2eed8bba..9280baea 100644
--- a/lib/overcommit/hook/post_checkout/bower_install.rb
+++ b/lib/overcommit/hook/post_checkout/bower_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCheckout
   # Runs `bower install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BowerInstall}
+  # @see Overcommit::Hook::Shared::BowerInstall
   class BowerInstall < Base
     include Overcommit::Hook::Shared::BowerInstall
   end
diff --git a/lib/overcommit/hook/post_checkout/bundle_install.rb b/lib/overcommit/hook/post_checkout/bundle_install.rb
index 880b3d89..2641ded6 100644
--- a/lib/overcommit/hook/post_checkout/bundle_install.rb
+++ b/lib/overcommit/hook/post_checkout/bundle_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCheckout
   # Runs `bundle install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BundleInstall}
+  # @see Overcommit::Hook::Shared::BundleInstall
   class BundleInstall < Base
     include Overcommit::Hook::Shared::BundleInstall
   end
diff --git a/lib/overcommit/hook/post_checkout/composer_install.rb b/lib/overcommit/hook/post_checkout/composer_install.rb
index f6449500..d5b9abed 100644
--- a/lib/overcommit/hook/post_checkout/composer_install.rb
+++ b/lib/overcommit/hook/post_checkout/composer_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCheckout
   # Runs `composer install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::ComposerInstall}
+  # @see Overcommit::Hook::Shared::ComposerInstall
   class ComposerInstall < Base
     include Overcommit::Hook::Shared::ComposerInstall
   end
diff --git a/lib/overcommit/hook/post_checkout/index_tags.rb b/lib/overcommit/hook/post_checkout/index_tags.rb
index 2a42821d..eb3456ba 100644
--- a/lib/overcommit/hook/post_checkout/index_tags.rb
+++ b/lib/overcommit/hook/post_checkout/index_tags.rb
@@ -5,7 +5,7 @@
 module Overcommit::Hook::PostCheckout
   # Updates ctags index for all source code in the repository.
   #
-  # @see {Overcommit::Hook::Shared::IndexTags}
+  # @see Overcommit::Hook::Shared::IndexTags
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
   end
diff --git a/lib/overcommit/hook/post_checkout/npm_install.rb b/lib/overcommit/hook/post_checkout/npm_install.rb
index 6f2c1a1b..66b1d425 100644
--- a/lib/overcommit/hook/post_checkout/npm_install.rb
+++ b/lib/overcommit/hook/post_checkout/npm_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCheckout
   # Runs `npm install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::NpmInstall}
+  # @see Overcommit::Hook::Shared::NpmInstall
   class NpmInstall < Base
     include Overcommit::Hook::Shared::NpmInstall
   end
diff --git a/lib/overcommit/hook/post_checkout/yarn_install.rb b/lib/overcommit/hook/post_checkout/yarn_install.rb
index 4d876c92..94a59e63 100644
--- a/lib/overcommit/hook/post_checkout/yarn_install.rb
+++ b/lib/overcommit/hook/post_checkout/yarn_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCheckout
   # Runs `yarn install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::YarnInstall}
+  # @see Overcommit::Hook::Shared::YarnInstall
   class YarnInstall < Base
     include Overcommit::Hook::Shared::YarnInstall
   end
diff --git a/lib/overcommit/hook/post_commit/bower_install.rb b/lib/overcommit/hook/post_commit/bower_install.rb
index 71a691fa..e35ae231 100644
--- a/lib/overcommit/hook/post_commit/bower_install.rb
+++ b/lib/overcommit/hook/post_commit/bower_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCommit
   # Runs `bower install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BowerInstall}
+  # @see Overcommit::Hook::Shared::BowerInstall
   class BowerInstall < Base
     include Overcommit::Hook::Shared::BowerInstall
   end
diff --git a/lib/overcommit/hook/post_commit/bundle_install.rb b/lib/overcommit/hook/post_commit/bundle_install.rb
index dbb18267..1c4abb32 100644
--- a/lib/overcommit/hook/post_commit/bundle_install.rb
+++ b/lib/overcommit/hook/post_commit/bundle_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCommit
   # Runs `bundle install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BundleInstall}
+  # @see Overcommit::Hook::Shared::BundleInstall
   class BundleInstall < Base
     include Overcommit::Hook::Shared::BundleInstall
   end
diff --git a/lib/overcommit/hook/post_commit/composer_install.rb b/lib/overcommit/hook/post_commit/composer_install.rb
index 6ae4f704..adbdc33a 100644
--- a/lib/overcommit/hook/post_commit/composer_install.rb
+++ b/lib/overcommit/hook/post_commit/composer_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCommit
   # Runs `composer install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::ComposerInstall}
+  # @see Overcommit::Hook::Shared::ComposerInstall
   class ComposerInstall < Base
     include Overcommit::Hook::Shared::ComposerInstall
   end
diff --git a/lib/overcommit/hook/post_commit/index_tags.rb b/lib/overcommit/hook/post_commit/index_tags.rb
index 89cc4784..175bbf6f 100644
--- a/lib/overcommit/hook/post_commit/index_tags.rb
+++ b/lib/overcommit/hook/post_commit/index_tags.rb
@@ -5,7 +5,7 @@
 module Overcommit::Hook::PostCommit
   # Updates ctags index for all source code in the repository.
   #
-  # @see {Overcommit::Hook::Shared::IndexTags}
+  # @see Overcommit::Hook::Shared::IndexTags
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
   end
diff --git a/lib/overcommit/hook/post_commit/npm_install.rb b/lib/overcommit/hook/post_commit/npm_install.rb
index cc5b0fed..df2f5af3 100644
--- a/lib/overcommit/hook/post_commit/npm_install.rb
+++ b/lib/overcommit/hook/post_commit/npm_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCommit
   # Runs `npm install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::NpmInstall}
+  # @see Overcommit::Hook::Shared::NpmInstall
   class NpmInstall < Base
     include Overcommit::Hook::Shared::NpmInstall
   end
diff --git a/lib/overcommit/hook/post_commit/yarn_install.rb b/lib/overcommit/hook/post_commit/yarn_install.rb
index 5525d933..69ae7670 100644
--- a/lib/overcommit/hook/post_commit/yarn_install.rb
+++ b/lib/overcommit/hook/post_commit/yarn_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostCommit
   # Runs `yarn install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::YarnInstall}
+  # @see Overcommit::Hook::Shared::YarnInstall
   class YarnInstall < Base
     include Overcommit::Hook::Shared::YarnInstall
   end
diff --git a/lib/overcommit/hook/post_merge/bower_install.rb b/lib/overcommit/hook/post_merge/bower_install.rb
index defd1d2e..982e8152 100644
--- a/lib/overcommit/hook/post_merge/bower_install.rb
+++ b/lib/overcommit/hook/post_merge/bower_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostMerge
   # Runs `bower install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BowerInstall}
+  # @see Overcommit::Hook::Shared::BowerInstall
   class BowerInstall < Base
     include Overcommit::Hook::Shared::BowerInstall
   end
diff --git a/lib/overcommit/hook/post_merge/bundle_install.rb b/lib/overcommit/hook/post_merge/bundle_install.rb
index df6ab67a..b9b147bd 100644
--- a/lib/overcommit/hook/post_merge/bundle_install.rb
+++ b/lib/overcommit/hook/post_merge/bundle_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostMerge
   # Runs `bundle install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BundleInstall}
+  # @see Overcommit::Hook::Shared::BundleInstall
   class BundleInstall < Base
     include Overcommit::Hook::Shared::BundleInstall
   end
diff --git a/lib/overcommit/hook/post_merge/composer_install.rb b/lib/overcommit/hook/post_merge/composer_install.rb
index 841353eb..80d8fb94 100644
--- a/lib/overcommit/hook/post_merge/composer_install.rb
+++ b/lib/overcommit/hook/post_merge/composer_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostMerge
   # Runs `composer install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::ComposerInstall}
+  # @see Overcommit::Hook::Shared::ComposerInstall
   class ComposerInstall < Base
     include Overcommit::Hook::Shared::ComposerInstall
   end
diff --git a/lib/overcommit/hook/post_merge/index_tags.rb b/lib/overcommit/hook/post_merge/index_tags.rb
index 76ec3d57..a7da71a1 100644
--- a/lib/overcommit/hook/post_merge/index_tags.rb
+++ b/lib/overcommit/hook/post_merge/index_tags.rb
@@ -5,7 +5,7 @@
 module Overcommit::Hook::PostMerge
   # Updates ctags index for all source code in the repository.
   #
-  # @see {Overcommit::Hook::Shared::IndexTags}
+  # @see Overcommit::Hook::Shared::IndexTags
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
   end
diff --git a/lib/overcommit/hook/post_merge/npm_install.rb b/lib/overcommit/hook/post_merge/npm_install.rb
index e016b40e..099e838c 100644
--- a/lib/overcommit/hook/post_merge/npm_install.rb
+++ b/lib/overcommit/hook/post_merge/npm_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostMerge
   # Runs `npm install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::NpmInstall}
+  # @see Overcommit::Hook::Shared::NpmInstall
   class NpmInstall < Base
     include Overcommit::Hook::Shared::NpmInstall
   end
diff --git a/lib/overcommit/hook/post_merge/yarn_install.rb b/lib/overcommit/hook/post_merge/yarn_install.rb
index 1ba4c0d9..d47199db 100644
--- a/lib/overcommit/hook/post_merge/yarn_install.rb
+++ b/lib/overcommit/hook/post_merge/yarn_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostMerge
   # Runs `yarn install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::YarnInstall}
+  # @see Overcommit::Hook::Shared::YarnInstall
   class YarnInstall < Base
     include Overcommit::Hook::Shared::YarnInstall
   end
diff --git a/lib/overcommit/hook/post_rewrite/bower_install.rb b/lib/overcommit/hook/post_rewrite/bower_install.rb
index 558c3f70..9974e629 100644
--- a/lib/overcommit/hook/post_rewrite/bower_install.rb
+++ b/lib/overcommit/hook/post_rewrite/bower_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostRewrite
   # Runs `bower install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BowerInstall}
+  # @see Overcommit::Hook::Shared::BowerInstall
   class BowerInstall < Base
     include Overcommit::Hook::Shared::BowerInstall
   end
diff --git a/lib/overcommit/hook/post_rewrite/bundle_install.rb b/lib/overcommit/hook/post_rewrite/bundle_install.rb
index 17c94570..b6409338 100644
--- a/lib/overcommit/hook/post_rewrite/bundle_install.rb
+++ b/lib/overcommit/hook/post_rewrite/bundle_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostRewrite
   # Runs `bundle install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::BundleInstall}
+  # @see Overcommit::Hook::Shared::BundleInstall
   class BundleInstall < Base
     include Overcommit::Hook::Shared::BundleInstall
   end
diff --git a/lib/overcommit/hook/post_rewrite/composer_install.rb b/lib/overcommit/hook/post_rewrite/composer_install.rb
index 11bd7c2f..40a23f54 100644
--- a/lib/overcommit/hook/post_rewrite/composer_install.rb
+++ b/lib/overcommit/hook/post_rewrite/composer_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostRewrite
   # Runs `composer install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::ComposerInstall}
+  # @see Overcommit::Hook::Shared::ComposerInstall
   class ComposerInstall < Base
     include Overcommit::Hook::Shared::ComposerInstall
   end
diff --git a/lib/overcommit/hook/post_rewrite/index_tags.rb b/lib/overcommit/hook/post_rewrite/index_tags.rb
index cd117c19..a3a54550 100644
--- a/lib/overcommit/hook/post_rewrite/index_tags.rb
+++ b/lib/overcommit/hook/post_rewrite/index_tags.rb
@@ -5,7 +5,7 @@
 module Overcommit::Hook::PostRewrite
   # Updates ctags index for all source code in the repository.
   #
-  # @see {Overcommit::Hook::Shared::IndexTags}
+  # @see Overcommit::Hook::Shared::IndexTags
   class IndexTags < Base
     include Overcommit::Hook::Shared::IndexTags
 
diff --git a/lib/overcommit/hook/post_rewrite/npm_install.rb b/lib/overcommit/hook/post_rewrite/npm_install.rb
index b7d408ac..3c94d365 100644
--- a/lib/overcommit/hook/post_rewrite/npm_install.rb
+++ b/lib/overcommit/hook/post_rewrite/npm_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostRewrite
   # Runs `npm install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::NpmInstall}
+  # @see Overcommit::Hook::Shared::NpmInstall
   class NpmInstall < Base
     include Overcommit::Hook::Shared::NpmInstall
   end
diff --git a/lib/overcommit/hook/post_rewrite/yarn_install.rb b/lib/overcommit/hook/post_rewrite/yarn_install.rb
index 40807bba..fdb64d3e 100644
--- a/lib/overcommit/hook/post_rewrite/yarn_install.rb
+++ b/lib/overcommit/hook/post_rewrite/yarn_install.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PostRewrite
   # Runs `yarn install` when a change is detected in the repository's
   # dependencies.
   #
-  # @see {Overcommit::Hook::Shared::YarnInstall}
+  # @see Overcommit::Hook::Shared::YarnInstall
   class YarnInstall < Base
     include Overcommit::Hook::Shared::YarnInstall
   end
diff --git a/lib/overcommit/hook/pre_commit/rake_target.rb b/lib/overcommit/hook/pre_commit/rake_target.rb
index 555fff42..8ee36ba6 100644
--- a/lib/overcommit/hook/pre_commit/rake_target.rb
+++ b/lib/overcommit/hook/pre_commit/rake_target.rb
@@ -5,7 +5,7 @@
 module Overcommit::Hook::PreCommit
   # Runs rake targets
   #
-  # @see {Overcommit::Hook::Shared::RakeTarget}
+  # @see Overcommit::Hook::Shared::RakeTarget
   class RakeTarget < Base
     include Overcommit::Hook::Shared::RakeTarget
   end
diff --git a/lib/overcommit/hook/pre_push/rake_target.rb b/lib/overcommit/hook/pre_push/rake_target.rb
index eb480c20..f44897de 100644
--- a/lib/overcommit/hook/pre_push/rake_target.rb
+++ b/lib/overcommit/hook/pre_push/rake_target.rb
@@ -5,7 +5,7 @@
 module Overcommit::Hook::PrePush
   # Runs rake targets
   #
-  # @see {Overcommit::Hook::Shared::RakeTarget}
+  # @see Overcommit::Hook::Shared::RakeTarget
   class RakeTarget < Base
     include Overcommit::Hook::Shared::RakeTarget
   end

From 5e7988370735d9861fb1cf4d56aa22bde04cfe55 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Fri, 29 Mar 2019 15:19:31 +0100
Subject: [PATCH 038/223] Fix misspellings

---
 lib/overcommit/hook/shared/rake_target.rb                    | 2 +-
 spec/overcommit/hook/pre_commit/chamber_verification_spec.rb | 4 ++--
 spec/overcommit/hook/pre_commit/jscs_spec.rb                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/overcommit/hook/shared/rake_target.rb b/lib/overcommit/hook/shared/rake_target.rb
index cbff2c19..6ef3873a 100644
--- a/lib/overcommit/hook/shared/rake_target.rb
+++ b/lib/overcommit/hook/shared/rake_target.rb
@@ -2,7 +2,7 @@
 
 module Overcommit::Hook::Shared
   # runs specified rake targets. It fails on the first non-
-  # successfull exit.
+  # successful exit.
   #
   module RakeTarget
     def run
diff --git a/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb b/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb
index c3c35ede..a49e2a98 100644
--- a/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb
+++ b/spec/overcommit/hook/pre_commit/chamber_verification_spec.rb
@@ -33,7 +33,7 @@
     it { should pass }
   end
 
-  context 'when chamber exits unsucessfully via standard out' do
+  context 'when chamber exits unsuccessfully via standard out' do
     before do
       result = double('result')
       result.stub(:stdout).and_return('Some error message')
@@ -44,7 +44,7 @@
     it { should warn }
   end
 
-  context 'when chamber exits unsucessfully via standard error' do
+  context 'when chamber exits unsuccessfully via standard error' do
     before do
       result = double('result')
       result.stub(:stdout).and_return('')
diff --git a/spec/overcommit/hook/pre_commit/jscs_spec.rb b/spec/overcommit/hook/pre_commit/jscs_spec.rb
index ce03edb3..4cc56dec 100644
--- a/spec/overcommit/hook/pre_commit/jscs_spec.rb
+++ b/spec/overcommit/hook/pre_commit/jscs_spec.rb
@@ -24,7 +24,7 @@
     it { should fail_hook }
   end
 
-  context 'when jscs exits unsucessfully with status code 2' do
+  context 'when jscs exits unsuccessfully with status code 2' do
     let(:result) { double('result') }
 
     before do

From ef8eb44153ac54ac3a3cebaad4fc09e5a78cf9fa Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Mon, 1 Apr 2019 11:53:10 +0200
Subject: [PATCH 039/223] CI: Use 2.4.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 189d6398..ce0ea0cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ cache: bundler
 
 rvm:
   - 2.3.8
-  - 2.4.5
+  - 2.4.6
   - 2.5.5
   - 2.6.2
 

From 284163e90512e47be76a9105c775fc4ef9fa363f Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 12:12:36 +0900
Subject: [PATCH 040/223] Add FileSize hook

---
 lib/overcommit/hook/pre_commit/file_size.rb | 50 +++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/file_size.rb

diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
new file mode 100644
index 00000000..0c0212d0
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -0,0 +1,50 @@
+module Overcommit::Hook::PreCommit
+  class FileSize < Base
+    DEFAULT_SIZE_LIMIT_BYTES = 1_000_000 # 1MB
+
+    def run
+      return :pass if oversized_files.empty?
+
+      oversized_files.map do |file|
+        error_message_for(file)
+      end
+    end
+
+    private
+
+      def oversized_files
+        @_oversized_files ||= build_oversized_file_list
+      end
+
+      def build_oversized_file_list
+        applicable_files.select do |file|
+          File.size(file) > size_limit_bytes
+        end
+      end
+
+      def size_limit_bytes
+        config.fetch("size_limit_bytes", DEFAULT_SIZE_LIMIT_BYTES)
+      end
+
+      def error_message_for(file)
+        Overcommit::Hook::Message.new(
+          :error,
+          file,
+          nil,
+          error_text_for(file)
+        )
+      end
+
+      def error_text_for(file)
+        "#{relative_path_for(file)} is over the size limit."
+      end
+
+      def relative_path_for(file)
+        Pathname.new(file).relative_path_from(repo_root_path)
+      end
+
+      def repo_root_path
+        @_repo_root_path ||= Pathname.new(Overcommit::Utils.repo_root)
+      end
+  end
+end

From 9e9201c6841f3fc8cf2987a76295cbd522605dce Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 12:24:31 +0900
Subject: [PATCH 041/223] Adjust FileSize error message to show the actual size
 and limit

---
 lib/overcommit/hook/pre_commit/file_size.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
index 0c0212d0..b36eda91 100644
--- a/lib/overcommit/hook/pre_commit/file_size.rb
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -18,7 +18,7 @@ def oversized_files
 
       def build_oversized_file_list
         applicable_files.select do |file|
-          File.size(file) > size_limit_bytes
+          file_size(file) > size_limit_bytes
         end
       end
 
@@ -36,7 +36,11 @@ def error_message_for(file)
       end
 
       def error_text_for(file)
-        "#{relative_path_for(file)} is over the size limit."
+        "#{relative_path_for(file)} is over the file size limit of #{size_limit_bytes} bytes (is #{file_size(file)} bytes)"
+      end
+
+      def file_size(file)
+        File.size(file)
       end
 
       def relative_path_for(file)

From dc07b5eb333caef9308635e7feda6faf01bfd528 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 14:40:01 +0900
Subject: [PATCH 042/223] Fix Rubocop errors

---
 lib/overcommit/hook/pre_commit/file_size.rb | 71 ++++++++++++---------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
index b36eda91..08f17f47 100644
--- a/lib/overcommit/hook/pre_commit/file_size.rb
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Overcommit::Hook::PreCommit
+  # Checks for oversized files before committing.
   class FileSize < Base
     DEFAULT_SIZE_LIMIT_BYTES = 1_000_000 # 1MB
 
@@ -12,43 +15,51 @@ def run
 
     private
 
-      def oversized_files
-        @_oversized_files ||= build_oversized_file_list
-      end
+    def oversized_files
+      @oversized_files ||= build_oversized_file_list
+    end
 
-      def build_oversized_file_list
-        applicable_files.select do |file|
-          file_size(file) > size_limit_bytes
-        end
+    def build_oversized_file_list
+      applicable_files.select do |file|
+        file_size(file) > size_limit_bytes
       end
+    end
 
-      def size_limit_bytes
-        config.fetch("size_limit_bytes", DEFAULT_SIZE_LIMIT_BYTES)
-      end
+    def size_limit_bytes
+      config.fetch('size_limit_bytes', DEFAULT_SIZE_LIMIT_BYTES)
+    end
 
-      def error_message_for(file)
-        Overcommit::Hook::Message.new(
-          :error,
-          file,
-          nil,
-          error_text_for(file)
-        )
-      end
+    def error_message_for(file)
+      Overcommit::Hook::Message.new(
+        :error,
+        file,
+        nil,
+        error_text_for(file)
+      )
+    end
 
-      def error_text_for(file)
-        "#{relative_path_for(file)} is over the file size limit of #{size_limit_bytes} bytes (is #{file_size(file)} bytes)"
-      end
+    def error_text_for(file)
+      error_text_format % {
+        path: relative_path_for(file),
+        limit: size_limit_bytes,
+        size: file_size(file)
+      }
+    end
 
-      def file_size(file)
-        File.size(file)
-      end
+    def error_text_format
+      '%<path>s is over the file size limit of %<limit>s bytes (is %<size>s bytes)'
+    end
 
-      def relative_path_for(file)
-        Pathname.new(file).relative_path_from(repo_root_path)
-      end
+    def file_size(file)
+      File.size(file)
+    end
 
-      def repo_root_path
-        @_repo_root_path ||= Pathname.new(Overcommit::Utils.repo_root)
-      end
+    def relative_path_for(file)
+      Pathname.new(file).relative_path_from(repo_root_path)
+    end
+
+    def repo_root_path
+      @repo_root_path ||= Pathname.new(Overcommit::Utils.repo_root)
+    end
   end
 end

From ca0cfe61ca941521465b6938bf5c2499288d8488 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 14:43:15 +0900
Subject: [PATCH 043/223] Add FileSize to default.yml

---
 config/default.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/default.yml b/config/default.yml
index 3a1877bc..1c0a5e5a 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -293,6 +293,10 @@ PreCommit:
     flags: ['-IEHnw']
     keywords: ['BROKEN', 'BUG', 'ERROR', 'FIXME', 'HACK', 'NOTE', 'OPTIMIZE', 'REVIEW', 'TODO', 'WTF', 'XXX']
 
+  FileSize:
+    enabled: false
+    description: 'Check for oversized files'
+
   Flay:
     enabled: false
     description: 'Analyze ruby code for structural similarities with Flay'

From 81dd8c2f2905c4407728a07bb2306719f7d38f19 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 14:44:56 +0900
Subject: [PATCH 044/223] Move size_limit_bytes default to Yaml

---
 config/default.yml                          | 1 +
 lib/overcommit/hook/pre_commit/file_size.rb | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/default.yml b/config/default.yml
index 1c0a5e5a..51a2adf2 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -296,6 +296,7 @@ PreCommit:
   FileSize:
     enabled: false
     description: 'Check for oversized files'
+    size_limit_bytes: 1_000_000
 
   Flay:
     enabled: false
diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
index 08f17f47..48193fba 100644
--- a/lib/overcommit/hook/pre_commit/file_size.rb
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -3,8 +3,6 @@
 module Overcommit::Hook::PreCommit
   # Checks for oversized files before committing.
   class FileSize < Base
-    DEFAULT_SIZE_LIMIT_BYTES = 1_000_000 # 1MB
-
     def run
       return :pass if oversized_files.empty?
 
@@ -26,7 +24,7 @@ def build_oversized_file_list
     end
 
     def size_limit_bytes
-      config.fetch('size_limit_bytes', DEFAULT_SIZE_LIMIT_BYTES)
+      config.fetch('size_limit_bytes')
     end
 
     def error_message_for(file)

From 742a0fb7fab09cc89505ec2f42dd37a555b7fe52 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 14:46:58 +0900
Subject: [PATCH 045/223] Add FileSize to README and CHANGELOG

---
 CHANGELOG.md | 1 +
 README.md    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00cbef80..0e7cf538 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## master (unreleased)
 
 * Drop support for Ruby 2.2
+* Add `FileSize` pre-commit hook
 
 ## 0.47.0
 
diff --git a/README.md b/README.md
index 0317d30c..f8cc06e0 100644
--- a/README.md
+++ b/README.md
@@ -494,6 +494,7 @@ issue](https://github.com/brigade/overcommit/issues/238) for more details.
 * [EsLint](lib/overcommit/hook/pre_commit/es_lint.rb)
 * [ExecutePermissions](lib/overcommit/hook/pre_commit/execute_permissions.rb)
 * [Fasterer](lib/overcommit/hook/pre_commit/fasterer.rb)
+* [FileSize](lib/overcommit/hook/pre_commit/file_size.rb)
 * [FixMe](lib/overcommit/hook/pre_commit/fix_me.rb)
 * [Flay](lib/overcommit/hook/pre_commit/flay.rb)
 * [Foodcritic](lib/overcommit/hook/pre_commit/foodcritic.rb)

From a8d87e2b5d5d4a667c49b0599838eaed7e3d2c33 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 15:31:29 +0900
Subject: [PATCH 046/223] Make FileSize description dynamic (include limit)

---
 config/default.yml                          | 1 -
 lib/overcommit/hook/pre_commit/file_size.rb | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index 51a2adf2..f848d64b 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -295,7 +295,6 @@ PreCommit:
 
   FileSize:
     enabled: false
-    description: 'Check for oversized files'
     size_limit_bytes: 1_000_000
 
   Flay:
diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
index 48193fba..adabee22 100644
--- a/lib/overcommit/hook/pre_commit/file_size.rb
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -11,6 +11,10 @@ def run
       end
     end
 
+    def description
+      "Check for files over #{size_limit_bytes} bytes"
+    end
+
     private
 
     def oversized_files

From 5e326a9720fb62a3331d1953da328b187db7f3b0 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 15:42:48 +0900
Subject: [PATCH 047/223] Simplify error message

---
 lib/overcommit/hook/pre_commit/file_size.rb | 22 +--------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
index adabee22..fe237dd4 100644
--- a/lib/overcommit/hook/pre_commit/file_size.rb
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -36,32 +36,12 @@ def error_message_for(file)
         :error,
         file,
         nil,
-        error_text_for(file)
+        "#{file} is #{file_size(file)} bytes"
       )
     end
 
-    def error_text_for(file)
-      error_text_format % {
-        path: relative_path_for(file),
-        limit: size_limit_bytes,
-        size: file_size(file)
-      }
-    end
-
-    def error_text_format
-      '%<path>s is over the file size limit of %<limit>s bytes (is %<size>s bytes)'
-    end
-
     def file_size(file)
       File.size(file)
     end
-
-    def relative_path_for(file)
-      Pathname.new(file).relative_path_from(repo_root_path)
-    end
-
-    def repo_root_path
-      @repo_root_path ||= Pathname.new(Overcommit::Utils.repo_root)
-    end
   end
 end

From 0b95fcf6738881bf053ba20ed71a88836f7e6ddf Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 15:43:09 +0900
Subject: [PATCH 048/223] Add specs

---
 .../hook/pre_commit/file_size_spec.rb         | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 spec/overcommit/hook/pre_commit/file_size_spec.rb

diff --git a/spec/overcommit/hook/pre_commit/file_size_spec.rb b/spec/overcommit/hook/pre_commit/file_size_spec.rb
new file mode 100644
index 00000000..700f5b75
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/file_size_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::FileSize do
+  let(:config) do
+    Overcommit::ConfigurationLoader.default_configuration.merge(
+      Overcommit::Configuration.new(
+        'PreCommit' => {
+          'FileSize' => {
+            'size_limit_bytes' => 10
+          }
+        }
+      )
+    )
+  end
+
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+  let(:staged_file) { 'filename.txt' }
+
+  before do
+    subject.stub(:applicable_files).and_return([staged_file])
+  end
+
+  around do |example|
+    repo do
+      File.open(staged_file, 'w') { |f| f.write(contents) }
+      `git add "#{staged_file}" > #{File::NULL} 2>&1`
+      example.run
+    end
+  end
+
+  context 'when a big file is committed' do
+    let(:contents) { 'longer than 10 bytes' }
+
+    it { should fail_hook }
+  end
+
+  context 'when a small file is committed' do
+    let(:contents) { 'short' }
+
+    it { should_not fail_hook }
+  end
+end

From 5afeb8043cc7c069dec05d53072bfc378dab484f Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 15:56:43 +0900
Subject: [PATCH 049/223] Fix FileSize bug when file is removed from git

---
 lib/overcommit/hook/pre_commit/file_size.rb       |  2 +-
 spec/overcommit/hook/pre_commit/file_size_spec.rb | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/file_size.rb b/lib/overcommit/hook/pre_commit/file_size.rb
index fe237dd4..f81154ef 100644
--- a/lib/overcommit/hook/pre_commit/file_size.rb
+++ b/lib/overcommit/hook/pre_commit/file_size.rb
@@ -23,7 +23,7 @@ def oversized_files
 
     def build_oversized_file_list
       applicable_files.select do |file|
-        file_size(file) > size_limit_bytes
+        File.exist?(file) && file_size(file) > size_limit_bytes
       end
     end
 
diff --git a/spec/overcommit/hook/pre_commit/file_size_spec.rb b/spec/overcommit/hook/pre_commit/file_size_spec.rb
index 700f5b75..60b70477 100644
--- a/spec/overcommit/hook/pre_commit/file_size_spec.rb
+++ b/spec/overcommit/hook/pre_commit/file_size_spec.rb
@@ -42,4 +42,16 @@
 
     it { should_not fail_hook }
   end
+
+  context 'when a file is removed' do
+    let(:contents) { 'anything' }
+    before do
+      `git commit -m "Add file"`
+      `git rm "#{staged_file}"`
+    end
+
+    it 'should not raise an exception' do
+      lambda { should pass }.should_not raise_error
+    end
+  end
 end

From 94b525c5641f1c74a8015b43d7b7ed32628afd32 Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 15:57:36 +0900
Subject: [PATCH 050/223] Use should pass instead of should_not fail_hook

---
 spec/overcommit/hook/pre_commit/file_size_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/overcommit/hook/pre_commit/file_size_spec.rb b/spec/overcommit/hook/pre_commit/file_size_spec.rb
index 60b70477..7fb75898 100644
--- a/spec/overcommit/hook/pre_commit/file_size_spec.rb
+++ b/spec/overcommit/hook/pre_commit/file_size_spec.rb
@@ -40,7 +40,7 @@
   context 'when a small file is committed' do
     let(:contents) { 'short' }
 
-    it { should_not fail_hook }
+    it { should pass }
   end
 
   context 'when a file is removed' do

From 63ef29d4e1e47612ca5e24fb53f4352d38e69aca Mon Sep 17 00:00:00 2001
From: David Stosik <david.stosik+git-noreply@gmail.com>
Date: Mon, 15 Apr 2019 16:30:04 +0900
Subject: [PATCH 051/223] Restore hook description in default.yml

---
 config/default.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/default.yml b/config/default.yml
index f848d64b..51a2adf2 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -295,6 +295,7 @@ PreCommit:
 
   FileSize:
     enabled: false
+    description: 'Check for oversized files'
     size_limit_bytes: 1_000_000
 
   Flay:

From 717d92983b0f6a889bde3b584b3c26b870a08b72 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 21 Apr 2019 21:08:05 -0700
Subject: [PATCH 052/223] Don't modify frozen string in check_for_executable

Fixes #635
---
 lib/overcommit/hook/base.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index 6ba69d75..bd1954d3 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -204,11 +204,8 @@ def check_for_requirements
     def check_for_executable
       return unless required_executable && !in_path?(required_executable)
 
-      output = "'#{required_executable}' is not installed, not in your PATH, " \
-               'or does not have execute permissions'
-      output << install_command_prompt
-
-      output
+      "'#{required_executable}' is not installed, not in your PATH, " \
+      "or does not have execute permissions#{install_command_prompt}"
     end
 
     def install_command_prompt

From b8f2874866f8a0ac7876ec92863d2699559d49b0 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 15:28:17 -0700
Subject: [PATCH 053/223] Update references to Brigade

Ensure links/references are up to date now that we've transferred
ownership.
---
 CHANGELOG.md                                |  4 ++--
 CONTRIBUTING.md                             |  4 ++--
 MIT-LICENSE                                 |  3 +--
 README.md                                   | 26 ++++++++++-----------
 config/starter.yml                          |  6 ++---
 lib/overcommit/constants.rb                 |  2 +-
 lib/overcommit/hook/pre_commit/scss_lint.rb |  2 +-
 overcommit.gemspec                          |  4 ++--
 8 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e7cf538..22e048a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -503,7 +503,7 @@
 * Disable almost all hooks by default. You will now need to explicitly enable
   almost all hooks yourself in your `.overcommit.yml`. If you are migrating from
   `overcommit` 0.23.0 and want to use the default configuration that shipped
-  with that version, copy the [default configuration from 0.23.0](https://github.com/brigade/overcommit/blob/9f03e9c82b385d375a836ca7146b117dbde5c822/config/default.yml)
+  with that version, copy the [default configuration from 0.23.0](https://github.com/sds/overcommit/blob/9f03e9c82b385d375a836ca7146b117dbde5c822/config/default.yml)
 * Update `ScssLint` pre-commit hook to properly handle special exit code that
   signals all files were filtered by exclusions (new as of `scss-lint` 0.36.0)
 * Update `childprocess` dependency to minimum 0.5.6
@@ -861,7 +861,7 @@
 ## 0.2.6
 
 * Added check for linting HAML files with
-  [haml-lint](https://github.com/brigade/haml-lint)
+  [haml-lint](https://github.com/sds/haml-lint)
 
 ## 0.2.5
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index edca7acb..102b4032 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,7 +73,7 @@ The reasoning for this perhaps odd naming scheme is to strike a balance between
 consistency, familiarity for those who already know the tool, and Overcommit's
 ability to deduce the name of a hook from its filename and vice versa.
 
-[1]: https://github.com/brigade/overcommit/issues
+[1]: https://github.com/sds/overcommit/issues
 [2]: https://medium.com/brigade-engineering/the-secrets-to-great-commit-messages-106fc0a92a25
 [3]: https://travis-ci.org/
 
@@ -82,4 +82,4 @@ ability to deduce the name of a hook from its filename and vice versa.
 This project adheres to the [Open Code of Conduct][code-of-conduct]. By
 participating, you are expected to honor this code.
 
-[code-of-conduct]: https://github.com/brigade/code-of-conduct
+[code-of-conduct]: https://github.com/civiccc/code-of-conduct
diff --git a/MIT-LICENSE b/MIT-LICENSE
index 5d9e2dcb..d5312cfb 100644
--- a/MIT-LICENSE
+++ b/MIT-LICENSE
@@ -1,5 +1,4 @@
-Copyright (c) 2013-2015 Brigade Engineering, Aiden Scandella, Shane da Silva
-https://www.brigade.com/
+Copyright (c) 2013-2019 Shane da Silva, Aiden Scandella
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/README.md b/README.md
index f8cc06e0..b2dcc350 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
 [![Gem Version](https://badge.fury.io/rb/overcommit.svg)](https://badge.fury.io/rb/overcommit)
-[![Build Status](https://travis-ci.org/brigade/overcommit.svg?branch=master)](https://travis-ci.org/brigade/overcommit)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/iqsr6jtrq6y0jhqq/branch/master?svg=true)](https://ci.appveyor.com/project/brigade/overcommit/branch/master)
-[![Coverage Status](https://coveralls.io/repos/github/brigade/overcommit/badge.svg?branch=master)](https://coveralls.io/github/brigade/overcommit?branch=master)
-[![Code Climate](https://codeclimate.com/github/brigade/overcommit.svg)](https://codeclimate.com/github/brigade/overcommit)
-[![Inline docs](http://inch-ci.org/github/brigade/overcommit.svg?branch=master)](http://inch-ci.org/github/brigade/overcommit)
+[![Build Status](https://travis-ci.org/sds/overcommit.svg?branch=master)](https://travis-ci.org/sds/overcommit)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/iqsr6jtrq6y0jhqq/branch/master?svg=true)](https://ci.appveyor.com/project/sds/overcommit/branch/master)
+[![Coverage Status](https://coveralls.io/repos/github/sds/overcommit/badge.svg?branch=master)](https://coveralls.io/github/sds/overcommit?branch=master)
+[![Code Climate](https://codeclimate.com/github/sds/overcommit.svg)](https://codeclimate.com/github/sds/overcommit)
+[![Inline docs](http://inch-ci.org/github/sds/overcommit.svg?branch=master)](http://inch-ci.org/github/sds/overcommit)
 
 <p align="center">
-  <img src="https://raw.githubusercontent.com/brigade/overcommit/master/logo/horizontal.png" width="65%" alt="Overcommit Logo"/>
+  <img src="https://raw.githubusercontent.com/sds/overcommit/master/logo/horizontal.png" width="65%" alt="Overcommit Logo"/>
 </p>
 
 `overcommit` is a tool to manage and configure
 [Git hooks](http://git-scm.com/book/en/Customizing-Git-Git-Hooks).
 
-![Demonstration](https://brigade.github.io/overcommit/overcommit.gif)
+![Demonstration](https://sds.github.io/overcommit/overcommit.gif)
 
 In addition to supporting a wide variety of hooks that can be used across
 multiple repositories, you can also define hooks specific to a repository which
@@ -60,7 +60,7 @@ This project aims to support the following Ruby runtimes on both \*nix and Windo
 
 Some of the hooks have third-party dependencies. For example, to lint your
 [SCSS](http://sass-lang.com/) files, you're going to need our
-[scss_lint gem](https://github.com/brigade/scss-lint).
+[scss_lint gem](https://github.com/sds/scss-lint).
 
 Depending on the hooks you enable/disable for your repository, you'll need to
 ensure your development environment already has those dependencies installed.
@@ -476,7 +476,7 @@ instead of whatever contents are in your working tree (as you don't want
 unstaged changes to taint your results). Overcommit takes care
 of this for you, but to do it in a generalized way introduces this
 limitation. See the [thread tracking this
-issue](https://github.com/brigade/overcommit/issues/238) for more details.
+issue](https://github.com/sds/overcommit/issues/238) for more details.
 
 * [`*`AuthorEmail](lib/overcommit/hook/pre_commit/author_email.rb)
 * [`*`AuthorName](lib/overcommit/hook/pre_commit/author_name.rb)
@@ -592,9 +592,9 @@ Out of the box, `overcommit` comes with a set of hooks that enforce a variety of
 styles and lints. However, some hooks only make sense in the context of a
 specific repository.
 
-At Brigade, for example, we have a number of simple checks that we run
-against our code to catch common errors. For example, since we use
-[RSpec](http://rspec.info/), we want to make sure all spec files contain the
+For example, you can have a number of simple checks that run
+against your code to catch common errors. For example, if you use
+[RSpec](http://rspec.info/), you can make sure all spec files contain the
 line `require 'spec_helper'`.
 
 Inside our repository, we can add the file
@@ -704,7 +704,7 @@ ensure your thoughts, ideas, or code get merged.
 ## Community
 
 All major discussion surrounding Overcommit happens on the
-[GitHub issues list](https://github.com/brigade/overcommit/issues).
+[GitHub issues list](https://github.com/sds/overcommit/issues).
 
 You can also follow [@git_overcommit on Twitter](https://twitter.com/git_overcommit).
 
diff --git a/config/starter.yml b/config/starter.yml
index 3037a427..c2bc6865 100644
--- a/config/starter.yml
+++ b/config/starter.yml
@@ -1,6 +1,6 @@
 # Use this file to configure the Overcommit hooks you wish to use. This will
 # extend the default configuration defined in:
-# https://github.com/brigade/overcommit/blob/master/config/default.yml
+# https://github.com/sds/overcommit/blob/master/config/default.yml
 #
 # At the topmost level of this YAML file is a key representing type of hook
 # being run (e.g. pre-commit, commit-msg, etc.). Within each type you can
@@ -8,10 +8,10 @@
 # `include`), whether to only display output if it fails (via `quiet`), etc.
 #
 # For a complete list of hooks, see:
-# https://github.com/brigade/overcommit/tree/master/lib/overcommit/hook
+# https://github.com/sds/overcommit/tree/master/lib/overcommit/hook
 #
 # For a complete list of options that you can use to customize hooks, see:
-# https://github.com/brigade/overcommit#configuration
+# https://github.com/sds/overcommit#configuration
 #
 # Uncomment the following lines to make the configuration take effect.
 
diff --git a/lib/overcommit/constants.rb b/lib/overcommit/constants.rb
index 69ba6658..dd027932 100644
--- a/lib/overcommit/constants.rb
+++ b/lib/overcommit/constants.rb
@@ -7,6 +7,6 @@ module Overcommit
 
   HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 
-  REPO_URL = 'https://github.com/brigade/overcommit'
+  REPO_URL = 'https://github.com/sds/overcommit'
   BUG_REPORT_URL = "#{REPO_URL}/issues"
 end
diff --git a/lib/overcommit/hook/pre_commit/scss_lint.rb b/lib/overcommit/hook/pre_commit/scss_lint.rb
index d521a914..6d279cec 100644
--- a/lib/overcommit/hook/pre_commit/scss_lint.rb
+++ b/lib/overcommit/hook/pre_commit/scss_lint.rb
@@ -3,7 +3,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `scss-lint` against any modified SCSS files.
   #
-  # @see https://github.com/brigade/scss-lint
+  # @see https://github.com/sds/scss-lint
   class ScssLint < Base
     def run
       result = execute(command, args: applicable_files)
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 56312641..2e8368c7 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.license               = 'MIT'
   s.summary               = 'Git hook manager'
   s.description           = 'Utility to install, configure, and extend Git hooks'
-  s.authors               = ['Brigade Engineering', 'Shane da Silva']
-  s.email                 = ['eng@brigade.com', 'shane.dasilva@brigade.com']
+  s.authors               = ['Shane da Silva']
+  s.email                 = ['shane@dasilva.io']
   s.homepage              = Overcommit::REPO_URL
   s.post_install_message  =
     'Install hooks by running `overcommit --install` in your Git repository'

From 1003db8c8c2f16eaef91c66dc94b866013c11d26 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 15:49:47 -0700
Subject: [PATCH 054/223] Update AppVeyor badge

Now that we've migrated we needed to create a new project.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2dcc350..1e105b6b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/overcommit.svg)](https://badge.fury.io/rb/overcommit)
 [![Build Status](https://travis-ci.org/sds/overcommit.svg?branch=master)](https://travis-ci.org/sds/overcommit)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/iqsr6jtrq6y0jhqq/branch/master?svg=true)](https://ci.appveyor.com/project/sds/overcommit/branch/master)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/umui038jlm597ryf?svg=true)](https://ci.appveyor.com/project/sds/overcommit)
 [![Coverage Status](https://coveralls.io/repos/github/sds/overcommit/badge.svg?branch=master)](https://coveralls.io/github/sds/overcommit?branch=master)
 [![Code Climate](https://codeclimate.com/github/sds/overcommit.svg)](https://codeclimate.com/github/sds/overcommit)
 [![Inline docs](http://inch-ci.org/github/sds/overcommit.svg?branch=master)](http://inch-ci.org/github/sds/overcommit)

From 81b490519b7cd9a58c9d2c35f6711a06a10e4fa5 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 16:19:50 -0700
Subject: [PATCH 055/223] Drop support for Ruby 2.3 and 32-bit Windows builds

Ruby 2.3 reached EOL on March 31, 2019:
https://www.ruby-lang.org/en/news/2019/03/31/support-of-ruby-2-3-has-ended/

As part of this, we needed run an autocorrect with RuboCop.

We also removed 32-bit Windows builds from the AppVeyor matrix. There's
no serious need to support 32-bit builds. Furthermore, these additional
builds make feedback take that much longer to receive.
---
 .rubocop.yml                                             | 2 +-
 .travis.yml                                              | 1 -
 CHANGELOG.md                                             | 2 +-
 README.md                                                | 2 +-
 appveyor.yml                                             | 5 -----
 lib/overcommit/configuration_validator.rb                | 2 +-
 lib/overcommit/hook/commit_msg/message_format.rb         | 2 +-
 lib/overcommit/hook/pre_commit/author_email.rb           | 2 +-
 lib/overcommit/hook/pre_commit/cook_style.rb             | 2 +-
 lib/overcommit/hook/pre_commit/go_vet.rb                 | 2 +-
 lib/overcommit/hook/pre_commit/jsl.rb                    | 2 +-
 lib/overcommit/hook/pre_commit/rubo_cop.rb               | 2 +-
 lib/overcommit/hook/prepare_commit_msg/replace_branch.rb | 2 +-
 overcommit.gemspec                                       | 2 +-
 14 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index bdc196db..56197f7d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 
 Layout/ClosingParenthesisIndentation:
   Enabled: false
diff --git a/.travis.yml b/.travis.yml
index ce0ea0cc..ebd3301c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.8
   - 2.4.6
   - 2.5.5
   - 2.6.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22e048a8..2f4e1265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## master (unreleased)
 
-* Drop support for Ruby 2.2
+* Drop support for Ruby 2.3 or older
 * Add `FileSize` pre-commit hook
 
 ## 0.47.0
diff --git a/README.md b/README.md
index 1e105b6b..0417ea47 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ any Ruby code.
 
 This project aims to support the following Ruby runtimes on both \*nix and Windows:
 
-* MRI 2.3+
+* Ruby 2.4+
 
 ### Dependencies
 
diff --git a/appveyor.yml b/appveyor.yml
index ef25794e..6a06b6de 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,13 +4,8 @@ clone_depth: 1
 
 environment:
   matrix:
-    - RUBY_FOLDER_VERSION: "23"
-    - RUBY_FOLDER_VERSION: "23-x64"
-    - RUBY_FOLDER_VERSION: "24"
     - RUBY_FOLDER_VERSION: "24-x64"
-    - RUBY_FOLDER_VERSION: "25"
     - RUBY_FOLDER_VERSION: "25-x64"
-    - RUBY_FOLDER_VERSION: "26"
     - RUBY_FOLDER_VERSION: "26-x64"
 matrix:
   fast_finish: true
diff --git a/lib/overcommit/configuration_validator.rb b/lib/overcommit/configuration_validator.rb
index 902f3be8..ce1eb317 100644
--- a/lib/overcommit/configuration_validator.rb
+++ b/lib/overcommit/configuration_validator.rb
@@ -102,7 +102,7 @@ def check_hook_name_format(hash)
         hash.fetch(hook_type) { {} }.each_key do |hook_name|
           next if hook_name == 'ALL'
 
-          unless hook_name =~ /\A[A-Za-z0-9]+\z/
+          unless hook_name.match?(/\A[A-Za-z0-9]+\z/)
             errors << "#{hook_type}::#{hook_name} has an invalid name " \
                       "#{hook_name}. It must contain only alphanumeric " \
                       'characters (no underscores or dashes, etc.)'
diff --git a/lib/overcommit/hook/commit_msg/message_format.rb b/lib/overcommit/hook/commit_msg/message_format.rb
index 36fd729f..f5093c24 100644
--- a/lib/overcommit/hook/commit_msg/message_format.rb
+++ b/lib/overcommit/hook/commit_msg/message_format.rb
@@ -19,7 +19,7 @@ def validate_pattern(message)
       expected_pattern_message = config['expected_pattern_message']
       sample_message = config['sample_message']
 
-      unless message =~ /#{pattern}/m
+      unless message.match?(/#{pattern}/m)
         [
           'Commit message pattern mismatch.',
           "Expected : #{expected_pattern_message}",
diff --git a/lib/overcommit/hook/pre_commit/author_email.rb b/lib/overcommit/hook/pre_commit/author_email.rb
index 7792cea4..37fbb478 100644
--- a/lib/overcommit/hook/pre_commit/author_email.rb
+++ b/lib/overcommit/hook/pre_commit/author_email.rb
@@ -12,7 +12,7 @@ def run
           result.stdout.chomp
         end
 
-      unless email =~ /#{config['pattern']}/
+      unless email.match?(/#{config['pattern']}/)
         return :fail,
                "Author has an invalid email address: '#{email}'\n" \
                'Set your email with ' \
diff --git a/lib/overcommit/hook/pre_commit/cook_style.rb b/lib/overcommit/hook/pre_commit/cook_style.rb
index afa480cb..e3242645 100644
--- a/lib/overcommit/hook/pre_commit/cook_style.rb
+++ b/lib/overcommit/hook/pre_commit/cook_style.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   # @see https://docs.chef.io/cookstyle.html
   class CookStyle < Base
     GENERIC_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
-      type =~ /^warn/ ? :warning : :error
+      type.match?(/^warn/) ? :warning : :error
     end
 
     COP_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
diff --git a/lib/overcommit/hook/pre_commit/go_vet.rb b/lib/overcommit/hook/pre_commit/go_vet.rb
index cc9151f9..92814648 100644
--- a/lib/overcommit/hook/pre_commit/go_vet.rb
+++ b/lib/overcommit/hook/pre_commit/go_vet.rb
@@ -9,7 +9,7 @@ def run
       result = execute(command, args: applicable_files)
       return :pass if result.success?
 
-      if result.stderr =~ /no such tool "vet"/
+      if result.stderr.match?(/no such tool "vet"/)
         return :fail, "`go tool vet` is not installed#{install_command_prompt}"
       end
 
diff --git a/lib/overcommit/hook/pre_commit/jsl.rb b/lib/overcommit/hook/pre_commit/jsl.rb
index 2b66ce94..38f8a0cf 100644
--- a/lib/overcommit/hook/pre_commit/jsl.rb
+++ b/lib/overcommit/hook/pre_commit/jsl.rb
@@ -8,7 +8,7 @@ class Jsl < Base
     MESSAGE_REGEX = /(?<file>(?:\w:)?.+)\((?<line>\d+)\):(?<type>[^:]+)/
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
-      type =~ /warning/ ? :warning : :error
+      type.match?(/warning/) ? :warning : :error
     end
 
     def run
diff --git a/lib/overcommit/hook/pre_commit/rubo_cop.rb b/lib/overcommit/hook/pre_commit/rubo_cop.rb
index 71c88980..4e3b3353 100644
--- a/lib/overcommit/hook/pre_commit/rubo_cop.rb
+++ b/lib/overcommit/hook/pre_commit/rubo_cop.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   # @see http://batsov.com/rubocop/
   class RuboCop < Base
     GENERIC_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
-      type =~ /^warn/ ? :warning : :error
+      type.match?(/^warn/) ? :warning : :error
     end
 
     COP_MESSAGE_TYPE_CATEGORIZER = lambda do |type|
diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index 9aed7d73..e1a3c997 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -11,7 +11,7 @@ def run
       Overcommit::Utils.log.debug(
         "Checking if '#{Overcommit::GitRepo.current_branch}' matches #{branch_pattern}"
       )
-      if branch_pattern.match(Overcommit::GitRepo.current_branch)
+      if branch_pattern.match?(Overcommit::GitRepo.current_branch)
         Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
         modify_commit_message do |old_contents|
           "#{new_template}\n#{old_contents}"
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 2e8368c7..8aaee5b3 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
                             Dir['libexec/**/*'] +
                             Dir['template-dir/**/*']
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
 
   s.add_dependency          'childprocess', '~> 0.6', '>= 0.6.3'
   s.add_dependency          'iniparse', '~> 1.4'

From ac13e9cafc70dbda39a1dec8d5283612a959f3e4 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 16:21:43 -0700
Subject: [PATCH 056/223] Update Code Climate badge

Their new product is called "Maintainability". We had to update since we
migrated the repository to a new owner.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0417ea47..9660b89c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![Build Status](https://travis-ci.org/sds/overcommit.svg?branch=master)](https://travis-ci.org/sds/overcommit)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/umui038jlm597ryf?svg=true)](https://ci.appveyor.com/project/sds/overcommit)
 [![Coverage Status](https://coveralls.io/repos/github/sds/overcommit/badge.svg?branch=master)](https://coveralls.io/github/sds/overcommit?branch=master)
-[![Code Climate](https://codeclimate.com/github/sds/overcommit.svg)](https://codeclimate.com/github/sds/overcommit)
+[![Maintainability](https://api.codeclimate.com/v1/badges/5da42f7f365e5fef6b4c/maintainability)](https://codeclimate.com/github/sds/overcommit/maintainability)
 [![Inline docs](http://inch-ci.org/github/sds/overcommit.svg?branch=master)](http://inch-ci.org/github/sds/overcommit)
 
 <p align="center">

From 2ccd9bd7d86e369135c698ad9c8f9274d8b1570b Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 17:00:56 -0700
Subject: [PATCH 057/223] =?UTF-8?q?Update=20TravisCI=20Ruby=202.6=20build?=
 =?UTF-8?q?=20from=202.6.2=20=E2=86=92=202.6.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ebd3301c..c0f4031c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ cache: bundler
 rvm:
   - 2.4.6
   - 2.5.5
-  - 2.6.2
+  - 2.6.3
 
 before_script:
   - git config --global user.email "travis@travis.ci"

From 85eadf8358e0864aec1b8f89981a26b27f863a8b Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 17:35:18 -0700
Subject: [PATCH 058/223] Update change log with MessageFormat fix

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f4e1265..2def6b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## master (unreleased)
 
 * Drop support for Ruby 2.3 or older
+* Support multi-line matches in `MessageFormat` `commit-msg` hook
 * Add `FileSize` pre-commit hook
 
 ## 0.47.0

From 35d60adb41da942178b789560968e3ad030b0ac7 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 2 May 2019 17:36:13 -0700
Subject: [PATCH 059/223] Cut version 0.48.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2def6b93..64bc18e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.48.0
 
 * Drop support for Ruby 2.3 or older
 * Support multi-line matches in `MessageFormat` `commit-msg` hook
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index a0c6b11f..7b060d0c 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.47.0'
+  VERSION = '0.48.0'
 end

From bc738aba1eec4aebf3c329bfecb00a62561b6717 Mon Sep 17 00:00:00 2001
From: Stephen Eckenrode <stephen.eckenrode@gmail.com>
Date: Tue, 4 Jun 2019 14:17:12 -0400
Subject: [PATCH 060/223] Correct extract line number output in Stylelint hook
 (#641)

The MESSAGE_REGEX for stylelint does not appropriately extract
line numbers >= 10.  This can cause the hook to incorrectly report
errors on modified lines as being for lines that are not modified.

This commit changes the regex to correctly handle multiple digits in
line numbers.
---
 lib/overcommit/hook/pre_commit/stylelint.rb       | 2 +-
 spec/overcommit/hook/pre_commit/stylelint_spec.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/stylelint.rb b/lib/overcommit/hook/pre_commit/stylelint.rb
index a063233a..403c5e27 100644
--- a/lib/overcommit/hook/pre_commit/stylelint.rb
+++ b/lib/overcommit/hook/pre_commit/stylelint.rb
@@ -8,7 +8,7 @@ class Stylelint < Base
     # example of output:
     # index.css: line 4, col 4, error - Expected indentation of 2 spaces (indentation)
 
-    MESSAGE_REGEX = /^(?<file>.+):\D*(?<line>\d).*$/
+    MESSAGE_REGEX = /^(?<file>.+):\D*(?<line>\d+).*$/
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/spec/overcommit/hook/pre_commit/stylelint_spec.rb b/spec/overcommit/hook/pre_commit/stylelint_spec.rb
index 3f619a25..d31ba948 100644
--- a/spec/overcommit/hook/pre_commit/stylelint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/stylelint_spec.rb
@@ -39,6 +39,10 @@
       end
 
       it { should fail_hook }
+
+      it 'extracts lines numbers correctly from output' do
+        expect(subject.run.map(&:line)).to eq([4, 10])
+      end
     end
   end
 end

From 7e8e6f21ab10a579beb9f9c49478040ef10d8e22 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 4 Jun 2019 18:17:25 -0400
Subject: [PATCH 061/223] Fix `GitRepo.list_files` for paths containing double
 quotes

Issue #642 reported a strange error from `sh` which turned out to be an
poorly-constructed command in the presence of a file containing double
quote characters.

The error would appear in the output:
```
sh: -c: line 0: unexpected EOF while looking for matching `"'
sh: -c: line 1: syntax error: unexpected end of file
```

Solution was to construct the command to escape those double quote
characters.
---
 lib/overcommit/git_repo.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/git_repo.rb b/lib/overcommit/git_repo.rb
index 54572507..f3bc0b0b 100644
--- a/lib/overcommit/git_repo.rb
+++ b/lib/overcommit/git_repo.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'iniparse'
+require 'shellwords'
 
 module Overcommit
   # Provide a set of utilities for certain interactions with `git`.
@@ -108,8 +109,7 @@ def modified_files(options)
     # @return [Array<String>] list of absolute file paths
     def list_files(paths = [], options = {})
       ref = options[:ref] || 'HEAD'
-      path_list = paths.empty? ? '' : "\"#{paths.join('" "')}\""
-      `git ls-tree --name-only #{ref} #{path_list}`.
+      `git ls-tree --name-only #{ref} #{paths.shelljoin}`.
         split(/\n/).
         map { |relative_file| File.expand_path(relative_file) }.
         reject { |file| File.directory?(file) } # Exclude submodule directories

From e982b0b64c9f5e966cd221aa24768a9e032bd61e Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 4 Jun 2019 18:25:30 -0400
Subject: [PATCH 062/223] Update change log with fixes

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64bc18e0..a1b5c9a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix `Stylelint` hook regex to extract line numbers with more than one digit
+* Fix `CaseConflicts` hook to work with file paths containing double quotes
+
 ## 0.48.0
 
 * Drop support for Ruby 2.3 or older

From 13dd0c04223643f5bab01a30ada24c6daab85832 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 4 Jun 2019 19:38:42 -0400
Subject: [PATCH 063/223] Fix GitRepo.list_files on Windows platforms

We broke the implementation for Windows platforms in 7e8e6f21 since the
`Shellwords` module is specific to the Bourne shell. Adjust the
implementation to work on Windows.
---
 lib/overcommit/git_repo.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/git_repo.rb b/lib/overcommit/git_repo.rb
index f3bc0b0b..bd659eb7 100644
--- a/lib/overcommit/git_repo.rb
+++ b/lib/overcommit/git_repo.rb
@@ -109,7 +109,14 @@ def modified_files(options)
     # @return [Array<String>] list of absolute file paths
     def list_files(paths = [], options = {})
       ref = options[:ref] || 'HEAD'
-      `git ls-tree --name-only #{ref} #{paths.shelljoin}`.
+      path_list =
+        if OS.windows?
+          paths = paths.map { |path| path.gsub('"', '""') }
+          paths.empty? ? '' : "\"#{paths.join('" "')}\""
+        else
+          paths.shelljoin
+        end
+      `git ls-tree --name-only #{ref} #{path_list}`.
         split(/\n/).
         map { |relative_file| File.expand_path(relative_file) }.
         reject { |file| File.directory?(file) } # Exclude submodule directories

From 569dc24a64e4b839b247658a688deccb03b716b8 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 4 Jun 2019 20:11:28 -0400
Subject: [PATCH 064/223] Cut version 0.48.1

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1b5c9a3..cd266bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.48.1
 
 * Fix `Stylelint` hook regex to extract line numbers with more than one digit
 * Fix `CaseConflicts` hook to work with file paths containing double quotes
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 7b060d0c..022aab36 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.48.0'
+  VERSION = '0.48.1'
 end

From d46dbf0d918fa208c83fa801fe75c7c06e07c7d9 Mon Sep 17 00:00:00 2001
From: Mark Delk <jethrodaniel@gmail.com>
Date: Sat, 8 Jun 2019 16:34:18 -0500
Subject: [PATCH 065/223] Add more replace_branch config options

Currently, `ReplaceBranch` only runs if the commit type is `commit`,
which means the hook won't run if you are using a template, for
instance.

This commit enhances the replace_branch prepare commit message hook to
allow specifying the types of commits to not apply this hook to.

Example:

To run this hook during merges, and when using templates

```
ReplaceBranch:
  enabled: true
  skipped_commit_types: ['message', 'squash']
```
---
 config/default.yml                            |  1 +
 .../hook/prepare_commit_msg/replace_branch.rb | 25 +++++++++++--------
 .../prepare_commit_msg/replace_branch_spec.rb | 14 ++++++++++-
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/config/default.yml b/config/default.yml
index 51a2adf2..b7bfce32 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1192,6 +1192,7 @@ PrepareCommitMsg:
     description: 'Prepends the commit message with text based on the branch name'
     branch_pattern: '\A.*\w+[-_](\d+).*\z'
     replacement_text: '[#\1]'
+    skipped_commit_types: ['message', 'template', 'merge', 'squash']
     on_fail: warn
 
 # Hooks that run during `git push`, after remote refs have been updated but
diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index e1a3c997..ce490163 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -6,20 +6,21 @@ module Overcommit::Hook::PrepareCommitMsg
   # the `branch_pattern` regex.
   class ReplaceBranch < Base
     def run
-      return :pass unless !commit_message_source ||
-        commit_message_source == :commit # NOTE: avoid 'merge' and 'rebase'
+      return :pass if skipped_commit_types.include? commit_message_source
+
       Overcommit::Utils.log.debug(
         "Checking if '#{Overcommit::GitRepo.current_branch}' matches #{branch_pattern}"
       )
-      if branch_pattern.match?(Overcommit::GitRepo.current_branch)
-        Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
-        modify_commit_message do |old_contents|
-          "#{new_template}\n#{old_contents}"
-        end
-        :pass
-      else
-        :warn
+
+      return :warn unless branch_pattern.match?(Overcommit::GitRepo.current_branch)
+
+      Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
+
+      modify_commit_message do |old_contents|
+        "#{new_template}\n#{old_contents}"
       end
+
+      :pass
     end
 
     def new_template
@@ -48,5 +49,9 @@ def replacement_text
     def replacement_text_config
       @replacement_text_config ||= config['replacement_text']
     end
+
+    def skipped_commit_types
+      @skipped_commit_types ||= config['skipped_commit_types'].map(&:to_sym)
+    end
   end
 end
diff --git a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
index ae66962c..71eb7c13 100644
--- a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
@@ -45,7 +45,19 @@
     context 'when the checked out branch does not match the pattern' do
       let(:new_head) { "this shouldn't match the default pattern" }
 
-      it { is_expected.to warn }
+      context 'when the commit type is in `skipped_commit_types`' do
+        let(:context) do
+          Overcommit::HookContext::PrepareCommitMsg.new(
+            config, [prepare_commit_message_file, 'template'], StringIO.new
+          )
+        end
+
+        it { is_expected.to pass }
+      end
+
+      context 'when the commit type is not in `skipped_commit_types`' do
+        it { is_expected.to warn }
+      end
     end
   end
 

From 017def79d276b36718ad90f6b011b1755a2d8c84 Mon Sep 17 00:00:00 2001
From: Diego J <diegojromerolopez@gmail.com>
Date: Wed, 26 Jun 2019 18:13:10 +0200
Subject: [PATCH 066/223] [FEATURE] New pre-commit hook: RubySyntax (#648)

Pre-commit hook RubySyntax check ruby files for syntax errors and show them. It uses ruby -c to check syntax.
---
 README.md                                     |  1 +
 config/default.yml                            | 13 +++++
 lib/overcommit/hook/pre_commit/ruby_syntax.rb | 27 ++++++++++
 .../hook/pre_commit/ruby_syntax_spec.rb       | 49 +++++++++++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/ruby_syntax.rb
 create mode 100644 spec/overcommit/hook/pre_commit/ruby_syntax_spec.rb

diff --git a/README.md b/README.md
index 9660b89c..5bc98e4c 100644
--- a/README.md
+++ b/README.md
@@ -540,6 +540,7 @@ issue](https://github.com/sds/overcommit/issues/238) for more details.
 * [Reek](lib/overcommit/hook/pre_commit/reek.rb)
 * [RuboCop](lib/overcommit/hook/pre_commit/rubo_cop.rb)
 * [RubyLint](lib/overcommit/hook/pre_commit/ruby_lint.rb)
+* [RubySyntax](lib/overcommit/hook/pre_commit/ruby_syntax.rb)
 * [SwiftLint](lib/overcommit/hook/pre_commit/swift_lint.rb)
 * [Scalariform](lib/overcommit/hook/pre_commit/scalariform.rb)
 * [Scalastyle](lib/overcommit/hook/pre_commit/scalastyle.rb)
diff --git a/config/default.yml b/config/default.yml
index b7bfce32..dcbd34a4 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -674,6 +674,19 @@ PreCommit:
       - '**/*.gemspec'
       - '**/*.rb'
 
+  RubySyntax:
+    enabled: false
+    description: 'Check ruby syntax'
+    required_executable: 'ruby'
+    command: [
+      'ruby',
+      '-e',
+      'ARGV.each { |applicable_file| ruby_c_output = `ruby -c #{applicable_file}`; puts ruby_c_output unless $?.success? }'
+    ]
+    include:
+      - '**/*.gemspec'
+      - '**/*.rb'
+
   Scalariform:
     enabled: false
     description: 'Check formatting with Scalariform'
diff --git a/lib/overcommit/hook/pre_commit/ruby_syntax.rb b/lib/overcommit/hook/pre_commit/ruby_syntax.rb
new file mode 100644
index 00000000..ac31e5ed
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/ruby_syntax.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `ruby -c` against all Ruby files.
+  #
+  class RubySyntax < Base
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.match?(/^(syntax)?\s*error/) ? :error : :warning
+    end
+
+    def run
+      result = execute(command, args: applicable_files)
+
+      result_lines = result.stderr.split("\n")
+
+      return :pass if result_lines.length.zero?
+
+      # Example message:
+      #   path/to/file.rb:1: syntax error, unexpected '^'
+      extract_messages(
+        result_lines,
+        /^(?<file>[^:]+):(?<line>\d+):\s*(?<type>[^,]+),\s*(?<message>.+)/,
+        MESSAGE_TYPE_CATEGORIZER
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/ruby_syntax_spec.rb b/spec/overcommit/hook/pre_commit/ruby_syntax_spec.rb
new file mode 100644
index 00000000..0eaa4459
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/ruby_syntax_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::RubySyntax do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.rb file2.rb])
+  end
+
+  context 'when ruby_syntax exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'with no errors' do
+      before do
+        result.stub(:stderr).and_return('')
+      end
+
+      it { should pass }
+    end
+  end
+
+  context 'when ruby_syntax exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stderr).and_return([
+                                          "file1.rb:2: syntax error, unexpected '^'"
+                                        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From 89aea0ed8757488d21010d97d2d55309bc392954 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 26 Jun 2019 09:16:13 -0700
Subject: [PATCH 067/223] Update change log

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd266bea..9509a4ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Add `skipped_commit_types` option to `ReplaceBranch` prepare-commit-msg hook
+* Add `RubySyntax` pre-commit hook
+
 ## 0.48.1
 
 * Fix `Stylelint` hook regex to extract line numbers with more than one digit

From 29f595d9f3e4f1c0ee20202fce9358fa8bbe53d9 Mon Sep 17 00:00:00 2001
From: Fabrizio Monti <fabrizio.monti@welaika.com>
Date: Mon, 24 Jun 2019 12:59:02 +0200
Subject: [PATCH 068/223] Relax childprocess dependency version

---
 overcommit.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overcommit.gemspec b/overcommit.gemspec
index 8aaee5b3..5545eec2 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency          'childprocess', '~> 0.6', '>= 0.6.3'
+  s.add_dependency          'childprocess', '>= 0.6.3', '< 2.0'
   s.add_dependency          'iniparse', '~> 1.4'
 end

From ed9f43245bfad878c1a02a5b6d32ce9944bbc6dd Mon Sep 17 00:00:00 2001
From: Fabrizio Monti <fabrizio.monti@welaika.com>
Date: Fri, 28 Jun 2019 16:53:48 +0200
Subject: [PATCH 069/223] Manually install ffi on Windows to make tests pass

---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index 375c88db..961e5d5a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,3 +13,5 @@ gem 'coveralls', '~> 0.8'
 
 # Pin RuboCop for Travis builds.
 gem 'rubocop', '0.54.0'
+
+gem 'ffi' if Gem.win_platform?

From 058906570e2430ad1b4ff1aebdcd15cd90573e0c Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 28 Jun 2019 20:03:05 -0700
Subject: [PATCH 070/223] Fix gemfile option integration spec to work on
 Windows

When we updated the childprocess dependency to allow 1.0+, we needed to
explicitly include the `ffi` gem on Windows builds.
---
 spec/integration/gemfile_option_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/integration/gemfile_option_spec.rb b/spec/integration/gemfile_option_spec.rb
index d67910aa..9cf25877 100644
--- a/spec/integration/gemfile_option_spec.rb
+++ b/spec/integration/gemfile_option_spec.rb
@@ -13,6 +13,7 @@
 
     gem 'overcommit', path: '#{repo_root}'
     gem 'my_fake_gem', path: '#{fake_gem_path}'
+    gem 'ffi' if Gem.win_platform? # Necessary for test to pass on Windows
   RUBY
 
   let(:gemspec) { normalize_indent(<<-RUBY) }

From aac1206b5140c83776e909a27f77f81921213303 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 28 Jun 2019 20:10:24 -0700
Subject: [PATCH 071/223] Update README with ffi requirement on Windows

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 5bc98e4c..21c5defc 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,12 @@ This project aims to support the following Ruby runtimes on both \*nix and Windo
 
 * Ruby 2.4+
 
+### Windows
+
+If you are using Overcommit on **Windows**, make sure you include the `ffi` gem in your
+list of dependencies. Overcommit does not include the `ffi` gem by default since it
+significantly increases the install time for non-Windows platforms.
+
 ### Dependencies
 
 Some of the hooks have third-party dependencies. For example, to lint your

From 8e3034352ecace2a5da3ca716b23eebbec88c7d5 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 28 Jun 2019 21:19:15 -0700
Subject: [PATCH 072/223] Update change log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9509a4ef..78d6feb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Add `skipped_commit_types` option to `ReplaceBranch` prepare-commit-msg hook
 * Add `RubySyntax` pre-commit hook
+* Relax `childprocess` dependency to allow version 1.x
 
 ## 0.48.1
 

From 04f3c4b1de6cb14ffa99edf09f3a754520231fc4 Mon Sep 17 00:00:00 2001
From: Diego J <diegojromerolopez@gmail.com>
Date: Wed, 3 Jul 2019 05:20:26 +0200
Subject: [PATCH 073/223] Add alfonsox spellcheck pre-commit hook (#654)

* [FEATURE] Code Spell Check (no tests present yet)

* Allow customization of code-spellcheck command

* Remove bundle from the alfonsox CLI tool call

* Remove messages that are not from the spell-checking errors in CodeSpellCheck pre-commit hook

* Tests for code-spell-check pre-commit hook

* [FIX] Remove wrong pre-commit hook: spellcheck

* [FIX] Rubocop: Metrics/LineLength: Line is too long.
---
 README.md                                     |  1 +
 config/default.yml                            |  9 +++++
 .../hook/pre_commit/code_spell_check.rb       | 36 +++++++++++++++++
 .../hook/pre_commit/code_spell_check_spec.rb  | 39 +++++++++++++++++++
 4 files changed, 85 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/code_spell_check.rb
 create mode 100644 spec/overcommit/hook/pre_commit/code_spell_check_spec.rb

diff --git a/README.md b/README.md
index 21c5defc..2edd844e 100644
--- a/README.md
+++ b/README.md
@@ -493,6 +493,7 @@ issue](https://github.com/sds/overcommit/issues/238) for more details.
 * [BundleOutdated](lib/overcommit/hook/pre_commit/bundle_outdated.rb)
 * [`*`CaseConflicts](lib/overcommit/hook/pre_commit/case_conflicts.rb)
 * [ChamberSecurity](lib/overcommit/hook/pre_commit/chamber_security.rb)
+* [CodeSpellCheck](lib/overcommit/hook/pre_commit/code_spell_check.rb)
 * [CoffeeLint](lib/overcommit/hook/pre_commit/coffee_lint.rb)
 * [Credo](lib/overcommit/hook/pre_commit/credo.rb)
 * [CssLint](lib/overcommit/hook/pre_commit/css_lint.rb)
diff --git a/config/default.yml b/config/default.yml
index dcbd34a4..3c32609e 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -222,6 +222,15 @@ PreCommit:
     install_command: 'gem install chamber'
     include: *chamber_settings_files
 
+  CodeSpellCheck:
+    enabled: false
+    description: 'Check if all your code is spell-checked correctly'
+    command: 'alfonsox'
+    install_command: 'gem install alfonsox'
+    include:
+      - '**/*.rb'
+      - '**/*.erb'
+
   CoffeeLint:
     enabled: false
     description: 'Analyze with coffeelint'
diff --git a/lib/overcommit/hook/pre_commit/code_spell_check.rb b/lib/overcommit/hook/pre_commit/code_spell_check.rb
new file mode 100644
index 00000000..a1132797
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/code_spell_check.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `alfonsox` spell-checking tool against any modified code file.
+  #
+  # @see https://github.com/diegojromerolopez/alfonsox
+  class CodeSpellCheck < Base
+    def run
+      # Create default file config if it does not exist
+
+      # Run spell-check
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      spellchecking_errors = result.stderr.split("\n")
+      spellchecking_errors.pop
+
+      error_messages(spellchecking_errors)
+    end
+
+    private
+
+    # Create the error messages
+    def error_messages(spellchecking_errors)
+      messages = []
+      spellchecking_errors.each do |spellchecking_error_i|
+        error_location, word = spellchecking_error_i.split(' ')
+        error_file_path, line = error_location.split(':')
+        messages << Overcommit::Hook::Message.new(
+          :error, error_file_path, line, "#{error_location}: #{word}"
+        )
+      end
+      messages
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/code_spell_check_spec.rb b/spec/overcommit/hook/pre_commit/code_spell_check_spec.rb
new file mode 100644
index 00000000..85a54b38
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/code_spell_check_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::CodeSpellCheck do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject       { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.rb file2.rb])
+  end
+
+  context 'when code-spell-check exists successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      result.stub(:stdout).and_return('')
+      result.stub(:stderr).and_return('')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when code-spell-check exists unsuccessfully via standard error' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(false)
+      result.stub(:stdout).and_return('')
+      result.stub(:stderr).and_return(
+        "file1.rb:35: inkorrectspelling\n✗ Errors in code spellchecking"
+      )
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should fail_hook }
+  end
+end

From 0bc55316d63fea9510e3c130b2251b67072ec0e2 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 2 Jul 2019 20:22:21 -0700
Subject: [PATCH 074/223] Update change log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78d6feb9..edc5cc88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Add `skipped_commit_types` option to `ReplaceBranch` prepare-commit-msg hook
 * Add `RubySyntax` pre-commit hook
 * Relax `childprocess` dependency to allow version 1.x
+* Add `CodeSpellCheck` pre-commit hook
 
 ## 0.48.1
 

From ae69744dfa615a1917ee78e7ba021e484d34b756 Mon Sep 17 00:00:00 2001
From: Jason Pickens <jasonpickensnz@gmail.com>
Date: Tue, 9 Jul 2019 16:15:58 +1200
Subject: [PATCH 075/223] Bug/650 traceback when setting parallelize to false
 (#656)

* Reproduce deadlock when parallize is false

* Fix potential deadlock when waiting for hooks

If a hook is running while another hook tries to start and there are
not enough slots left then it will wait for the first hook to stop and
release its slots. This first hook will not signal the second if there
are no more hooks left. This results in a deadlock.

This situation is far more likely to occur when parallelize is false
since the hook will consume all the available slots.
---
 CHANGELOG.md                         | 1 +
 lib/overcommit/hook_runner.rb        | 9 +++------
 spec/integration/parallelize_spec.rb | 9 ++++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edc5cc88..8fac916d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Add `RubySyntax` pre-commit hook
 * Relax `childprocess` dependency to allow version 1.x
 * Add `CodeSpellCheck` pre-commit hook
+* Fix deadlock which was more likely to occur when setting `parallelize` on a hook to `false`
 
 ## 0.48.1
 
diff --git a/lib/overcommit/hook_runner.rb b/lib/overcommit/hook_runner.rb
index 16af2c23..8ac01e99 100644
--- a/lib/overcommit/hook_runner.rb
+++ b/lib/overcommit/hook_runner.rb
@@ -129,12 +129,9 @@ def release_slot(hook)
         slots_released = processors_for_hook(hook)
         @slots_available += slots_released
 
-        if @hooks_left.any?
-          # Signal once. `wait_for_slot` will perform additional signals if
-          # there are still slots available. This prevents us from sending out
-          # useless signals
-          @resource.signal
-        end
+        # Signal every time in case there are threads that are already waiting for
+        # these slots to be released
+        @resource.signal
       end
     end
 
diff --git a/spec/integration/parallelize_spec.rb b/spec/integration/parallelize_spec.rb
index 4cf4c52d..20a86be3 100644
--- a/spec/integration/parallelize_spec.rb
+++ b/spec/integration/parallelize_spec.rb
@@ -7,10 +7,16 @@
   subject { shell(%w[git commit --allow-empty -m Test]) }
 
   let(:config) { <<-YML }
+    concurrency: 20
     CommitMsg:
       TrailingPeriod:
         enabled: true
         parallelize: false
+        command: ['ruby', '-e', 'sleep 1']
+      TextWidth:
+        enabled: true
+        parallelize: true
+        processors: 1
   YML
 
   around do |example|
@@ -22,6 +28,7 @@
   end
 
   it 'does not hang' do
-    Timeout.timeout(5) { subject }
+    result = Timeout.timeout(5) { subject }
+    result.stderr.should_not include 'No live threads left. Deadlock?'
   end
 end

From aba18680ce91079ee5b57f396aa8a735d64f1eda Mon Sep 17 00:00:00 2001
From: Jason Pickens <jasonpickensnz@gmail.com>
Date: Tue, 9 Jul 2019 16:17:38 +1200
Subject: [PATCH 076/223] Bug/652 markdown lint hook fails with unexpected
 output (#657)

Markdown lint 0.5.0 added a link to the rules after printing the
results. This caused the Mdl hook to fail as it was not expecting
this additional output.

Using the JSON output prevents the link to the rules from being
displayed and provided a more structured output for parsing.
---
 CHANGELOG.md                                |  1 +
 config/default.yml                          |  1 +
 lib/overcommit/hook/pre_commit/mdl.rb       | 18 +++++++++++-------
 spec/overcommit/hook/pre_commit/mdl_spec.rb |  5 ++++-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fac916d..32d48e50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Relax `childprocess` dependency to allow version 1.x
 * Add `CodeSpellCheck` pre-commit hook
 * Fix deadlock which was more likely to occur when setting `parallelize` on a hook to `false`
+* Fix `Mdl` hook to use JSON output and not fail on unexpected output
 
 ## 0.48.1
 
diff --git a/config/default.yml b/config/default.yml
index 3c32609e..1d428f98 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -486,6 +486,7 @@ PreCommit:
     enabled: false
     description: 'Analyze markdown files with mdl'
     required_executable: 'mdl'
+    flags: ['--json']
     install_command: 'gem install mdl'
     include: '**/*.md'
 
diff --git a/lib/overcommit/hook/pre_commit/mdl.rb b/lib/overcommit/hook/pre_commit/mdl.rb
index 17eccc78..4759936e 100644
--- a/lib/overcommit/hook/pre_commit/mdl.rb
+++ b/lib/overcommit/hook/pre_commit/mdl.rb
@@ -5,8 +5,6 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/mivok/markdownlint
   class Mdl < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):\s(?<msg>.+)/
-
     def run
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
@@ -15,11 +13,17 @@ def run
       return [:fail, result.stderr] unless result.stderr.empty?
 
       # example message:
-      #   path/to/file.md:1: MD001 Error message
-      extract_messages(
-        output.split("\n"),
-        MESSAGE_REGEX
-      )
+      #   [{"filename":"file1.md","line":1,"rule":"MD013","aliases":["line-length"],
+      #   "description":"Line length"}]
+      json_messages = JSON.parse(output)
+      json_messages.map do |message|
+        Overcommit::Hook::Message.new(
+          :error,
+          message[:filename],
+          message[:line],
+          message[:description]
+        )
+      end
     end
   end
 end
diff --git a/spec/overcommit/hook/pre_commit/mdl_spec.rb b/spec/overcommit/hook/pre_commit/mdl_spec.rb
index dc2aa6cd..e84b52cc 100644
--- a/spec/overcommit/hook/pre_commit/mdl_spec.rb
+++ b/spec/overcommit/hook/pre_commit/mdl_spec.rb
@@ -27,7 +27,10 @@
     let(:success) { false }
 
     context 'and it reports an error' do
-      let(:stdout) { 'file1.md:1: MD013 Line length' }
+      let(:stdout) do
+        '[{"filename":"file1.md","line":1,"rule":"MD013","aliases":["line-length"],'\
+        '"description":"Line length"}]'
+      end
       let(:stderr) { '' }
 
       it { should fail_hook }

From 202253d6d858ea2ce081d9d5c3bfcf17a9bc7355 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 9 Jul 2019 19:09:06 -0700
Subject: [PATCH 077/223] Cut version 0.49.0

---
 CHANGELOG.md              | 11 +++++++++--
 lib/overcommit/version.rb |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32d48e50..4feab9f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,18 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.49.0
+
+### New Features
 
 * Add `skipped_commit_types` option to `ReplaceBranch` prepare-commit-msg hook
 * Add `RubySyntax` pre-commit hook
-* Relax `childprocess` dependency to allow version 1.x
 * Add `CodeSpellCheck` pre-commit hook
+
+### Changes
+
+* Relax `childprocess` dependency to allow version 1.x
+
+### Bug Fixes
 * Fix deadlock which was more likely to occur when setting `parallelize` on a hook to `false`
 * Fix `Mdl` hook to use JSON output and not fail on unexpected output
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 022aab36..00496c88 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.48.1'
+  VERSION = '0.49.0'
 end

From b59c3f8d2bf1d2cd3b58f97839252012102338f8 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Tue, 30 Jul 2019 00:48:59 -0700
Subject: [PATCH 078/223] Fix typo: `require_executable` ->
 `required_executable`

It looks like this incorrect field name has existed since the inception
of the Stylelint plugin in
https://github.com/sds/overcommit/commit/22229c95854cdd02d19e6e24e20d7df9ac23fea3.
---
 config/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index 1d428f98..233f77fc 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -759,7 +759,7 @@ PreCommit:
   Stylelint:
     enabled: false
     description: 'Check styles with Stylelint'
-    require_executable: 'stylelint'
+    required_executable: 'stylelint'
     flags: ['-f', 'compact']
     install_command: 'npm install -g stylelint'
     include:

From 3760359c09a0d804f7ed48150c1e3ed08980d9e3 Mon Sep 17 00:00:00 2001
From: Alexander Berezovsky <a-b@users.noreply.github.com>
Date: Sun, 18 Aug 2019 00:08:31 -0700
Subject: [PATCH 079/223] Add check for Ginkgo Focused tests (#662)

This hook warn about focused ginkgo tests left in the code
---
 config/default.yml                            |  7 ++++++
 .../hook/pre_commit/ginkgo_focus.rb           | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/ginkgo_focus.rb

diff --git a/config/default.yml b/config/default.yml
index 233f77fc..02777c7e 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -330,6 +330,13 @@ PreCommit:
     quiet: true
     branch_patterns: ['master']
 
+  GinkgoFocus:
+    enabled: false
+    description: 'Check for "focused" tests'
+    required_executable: 'grep'
+    flags: ['-IEHnw']
+    keywords: ['FContext','FDescribe','FIt','FMeasure','FSpecify','FWhen']
+
   GoLint:
     enabled: false
     description: 'Analyze with golint'
diff --git a/lib/overcommit/hook/pre_commit/ginkgo_focus.rb b/lib/overcommit/hook/pre_commit/ginkgo_focus.rb
new file mode 100644
index 00000000..8528926e
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/ginkgo_focus.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Check for "focused" tests
+  class GinkgoFocus < Base
+    def run
+      keywords = config['keywords']
+      result = execute(command, args: [keywords.join('|')] + applicable_files)
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/,
+        lambda { |_type| :warning }
+      )
+    end
+
+    def applicable_test_files
+      applicable_files.select do |f|
+        f if f =~ /_test\.go/
+      end
+    end
+  end
+end

From a901f3d78118a6edbb14302072a3c22f1a19136a Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 18 Aug 2019 00:51:46 -0700
Subject: [PATCH 080/223] Fix parent_command to handle no parent process

Fixes #661.
---
 CHANGELOG.md                              | 4 ++++
 lib/overcommit/hook_context/pre_commit.rb | 1 +
 lib/overcommit/utils.rb                   | 5 +++++
 spec/overcommit/utils_spec.rb             | 8 ++++++++
 4 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4feab9f5..a05d1af8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix Overcommit to run when executed with no parent process
+
 ## 0.49.0
 
 ### New Features
diff --git a/lib/overcommit/hook_context/pre_commit.rb b/lib/overcommit/hook_context/pre_commit.rb
index 00c2872d..2378de5b 100644
--- a/lib/overcommit/hook_context/pre_commit.rb
+++ b/lib/overcommit/hook_context/pre_commit.rb
@@ -15,6 +15,7 @@ def amendment?
       return @amendment unless @amendment.nil?
 
       cmd = Overcommit::Utils.parent_command
+      return unless cmd
       amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
 
       # Since the ps command can return invalid byte sequences for commands
diff --git a/lib/overcommit/utils.rb b/lib/overcommit/utils.rb
index cac63d57..130046c3 100644
--- a/lib/overcommit/utils.rb
+++ b/lib/overcommit/utils.rb
@@ -133,7 +133,12 @@ def in_path?(cmd)
       end
 
       # Return the parent command that triggered this hook run
+      #
+      # @return [String,nil] the command as a string, if a parent exists.
       def parent_command
+        # When run in Docker containers, there may be no parent process.
+        return if Process.ppid.zero?
+
         if OS.windows?
           `wmic process where ProcessId=#{Process.ppid} get CommandLine /FORMAT:VALUE`.
             strip.
diff --git a/spec/overcommit/utils_spec.rb b/spec/overcommit/utils_spec.rb
index eeb53802..3be592ff 100644
--- a/spec/overcommit/utils_spec.rb
+++ b/spec/overcommit/utils_spec.rb
@@ -140,6 +140,14 @@
     end
 
     it { should =~ /rspec/ }
+
+    context 'when there is no parent' do
+      before do
+        Process.stub(:ppid) { 0 }
+      end
+
+      it { should be_nil }
+    end
   end
 
   describe '.execute' do

From 4018b0dea29cf7af246f0d0c40bff816e6c68df6 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 18 Aug 2019 01:22:47 -0700
Subject: [PATCH 081/223] Cut version 0.49.1

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a05d1af8..bc354561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.49.1
 
 * Fix Overcommit to run when executed with no parent process
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 00496c88..4139c581 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.49.0'
+  VERSION = '0.49.1'
 end

From a129f27fef39f8c6f5c28e8202a5885a9ed3ea46 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@coinbase.com>
Date: Wed, 28 Aug 2019 14:43:54 -0700
Subject: [PATCH 082/223] Display helpful error for hooks not inherit base
 class

There is a cryptic error message when you implement a custom hook and
forget to have it inherit from the base class. Since we rely on a lot of
functionality in the base class in hook implementations, ensure we
display a helpful error message when this condition is not met.
---
 CHANGELOG.md                       |  5 +++++
 lib/overcommit/hook_loader/base.rb | 24 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc354561..284b8996 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix Overcommit to display helpful error message when a hook does not inherit
+  from the base class
+
 ## 0.49.1
 
 * Fix Overcommit to run when executed with no parent process
diff --git a/lib/overcommit/hook_loader/base.rb b/lib/overcommit/hook_loader/base.rb
index 3e13472d..93e83ccc 100644
--- a/lib/overcommit/hook_loader/base.rb
+++ b/lib/overcommit/hook_loader/base.rb
@@ -26,13 +26,23 @@ def load_hooks
 
     # Load and return a {Hook} from a CamelCase hook name.
     def create_hook(hook_name)
-      Overcommit::Hook.const_get(@context.hook_class_name).
-                       const_get(hook_name).
-                       new(@config, @context)
-    rescue LoadError, NameError => error
-      raise Overcommit::Exceptions::HookLoadError,
-            "Unable to load hook '#{hook_name}': #{error}",
-            error.backtrace
+      hook_type_class = Overcommit::Hook.const_get(@context.hook_class_name)
+      hook_base_class = hook_type_class.const_get(:Base)
+      hook_class = hook_type_class.const_get(hook_name)
+      unless hook_class < hook_base_class
+        raise Overcommit::Exceptions::HookLoadError,
+              "Class #{hook_name} is not a subclass of #{hook_base_class}."
+      end
+
+      begin
+        Overcommit::Hook.const_get(@context.hook_class_name).
+                         const_get(hook_name).
+                         new(@config, @context)
+      rescue LoadError, NameError => error
+        raise Overcommit::Exceptions::HookLoadError,
+              "Unable to load hook '#{hook_name}': #{error}",
+              error.backtrace
+      end
     end
   end
 end

From 86ef69096245f298e7fb55ef7017fa6bd68511dc Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 2 Sep 2019 18:43:54 -0700
Subject: [PATCH 083/223] Update change log with Stylelint required_executable
 fix

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 284b8996..d93ef222 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ## 0.49.1
 
 * Fix Overcommit to run when executed with no parent process
+* Fix `Stylelint` pre-commit hook `required_executable`
 
 ## 0.49.0
 

From 5a6ca8990b2859b75be14a2e5606daa194a4c218 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 7 Sep 2019 01:05:52 -0700
Subject: [PATCH 084/223] Relax childprocess constraint to allow up to version
 2.x

ChildProcess released version 2.0.0 in July 2019. Allow Overcommit to
install this version as it doesn't affect core APIs.
---
 CHANGELOG.md       | 1 +
 overcommit.gemspec | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d93ef222..ac512b98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 * Fix Overcommit to display helpful error message when a hook does not inherit
   from the base class
+* Relax `childprocess` gem constraint to allow version 2.x
 
 ## 0.49.1
 
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 5545eec2..0d3c31ee 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency          'childprocess', '>= 0.6.3', '< 2.0'
+  s.add_dependency          'childprocess', '>= 0.6.3', '< 3.0'
   s.add_dependency          'iniparse', '~> 1.4'
 end

From 6e9c6705cdb457394b044b82bd9b63937fdf6c34 Mon Sep 17 00:00:00 2001
From: Pete Nicholls <pn@trineo.com>
Date: Sun, 8 Sep 2019 08:27:19 +1000
Subject: [PATCH 085/223] Travis: update Rubies to latest patch version

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0f4031c..31b4fb5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.7
+  - 2.5.6
+  - 2.6.4
 
 before_script:
   - git config --global user.email "travis@travis.ci"

From aeb649d6f067d8cc25e61b5a338487ef998ac63b Mon Sep 17 00:00:00 2001
From: Veniamin Krol <153412+vkrol@users.noreply.github.com>
Date: Tue, 10 Sep 2019 00:27:23 +0300
Subject: [PATCH 086/223] Get rid of the redundant Limitations item in TOC

The Limitations section was removed here https://github.com/sds/overcommit/commit/10c208081c9f5ff6adf479e7cbce44ad130cb514#diff-04c6e90faac2675aa89e2176d2eec7d8
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 2edd844e..bd064835 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ any Ruby code.
 
 * [Requirements](#requirements)
   * [Dependencies](#dependencies)
-* [Limitations](#limitations)
 * [Installation](#installation)
   * [Automatically Install Overcommit Hooks](#automatically-install-overcommit-hooks)
 * [Usage](#usage)

From a49b54601531bc6da5cf3d7aef7046fa277a36ea Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 25 Sep 2019 11:37:26 -0700
Subject: [PATCH 087/223] Disable literal pathspecs when applying stash

We need this in order to work around the behavior of emacs/magit where
it sets GIT_LITERAL_PATHSPECS=1, causing errors like:

    Unable to setup environment for pre-commit hook run:
    STDOUT:
    STDERR:error: pathspec ':/' did not match any file(s) known to git

Overriding the environment variable solves this issue.

Fixes #671.
---
 lib/overcommit/hook_context/pre_commit.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/overcommit/hook_context/pre_commit.rb b/lib/overcommit/hook_context/pre_commit.rb
index 2378de5b..99a7320c 100644
--- a/lib/overcommit/hook_context/pre_commit.rb
+++ b/lib/overcommit/hook_context/pre_commit.rb
@@ -53,9 +53,11 @@ def setup_environment
         @stash_attempted = true
 
         stash_message = "Overcommit: Stash of repo state before hook run at #{Time.now}"
-        result = Overcommit::Utils.execute(
-          %w[git -c commit.gpgsign=false stash save --keep-index --quiet] + [stash_message]
-        )
+        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

From 4b1e85ccd0c5bb467b3184a3b32abdb81f3a831a Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 25 Sep 2019 14:14:55 -0700
Subject: [PATCH 088/223] Relax childprocess constraint to allow up to version
 3.x

Version 3.0.0 has been released:
https://github.com/enkessler/childprocess/releases/tag/v3.0.0
---
 CHANGELOG.md       | 2 +-
 overcommit.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac512b98..7895f508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 * Fix Overcommit to display helpful error message when a hook does not inherit
   from the base class
-* Relax `childprocess` gem constraint to allow version 2.x
+* Relax `childprocess` gem constraint to allow up to version 3.x
 
 ## 0.49.1
 
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 0d3c31ee..4e06bfc8 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency          'childprocess', '>= 0.6.3', '< 3.0'
+  s.add_dependency          'childprocess', '>= 0.6.3', '< 4'
   s.add_dependency          'iniparse', '~> 1.4'
 end

From 3f81908f8557432c7d8259164b1f502360a20ed4 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 25 Sep 2019 14:19:46 -0700
Subject: [PATCH 089/223] Update change log

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7895f508..9744c07e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Fix Overcommit to display helpful error message when a hook does not inherit
   from the base class
 * Relax `childprocess` gem constraint to allow up to version 3.x
+* Display a helpful message if hooks do not inherit from the correct base class
+* Fix Overcommit to work with emacs/magit by [disabling literal pathspecs](https://magit.vc/manual/magit/My-Git-hooks-work-on-the-command_002dline-but-not-inside-Magit.html)
 
 ## 0.49.1
 

From 1aca914f1985e6fbda14bd44102c0078b24faae3 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 25 Sep 2019 14:20:43 -0700
Subject: [PATCH 090/223] Cut version 0.50.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9744c07e..497d51c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.50.0
 
 * Fix Overcommit to display helpful error message when a hook does not inherit
   from the base class
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 4139c581..d3004694 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.49.1'
+  VERSION = '0.50.0'
 end

From 985873ed0b7c9f38bca757831599d25a40aff86e Mon Sep 17 00:00:00 2001
From: Pavel Lobashov <ShockwaveNN@gmail.com>
Date: Thu, 26 Sep 2019 11:21:21 +0300
Subject: [PATCH 091/223] Do not specify minor ruby version for rvm in travis

This helps not to perform commit like this:
https://github.com/sds/overcommit/commit/2ccd9bd7d86e369135c698ad9c8f9274d8b1570b
---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31b4fb5e..f12366a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.4.7
-  - 2.5.6
-  - 2.6.4
+  - 2.4
+  - 2.5
+  - 2.6
 
 before_script:
   - git config --global user.email "travis@travis.ci"

From 9f82bfb8081b9460fbf39993e20fad0eb63529ca Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 28 Sep 2019 20:37:28 -0700
Subject: [PATCH 092/223] Avoid stashing changes when all changes are staged

It was suggested in #135 that a potential way to avoid unnecessary file
change detection and general stashing woes would be to stash changes
only when there were unstaged changes that needed to be excluded from
the run.

This presents a nice optimization that I wish we had considered long
ago. We can simplify the logic now that we see the purpose of this
feature a little more clearly: stash only when you need to.

Issue #669 raised an interesting point about the difficulty to detect if
a stash entry was created, so we modified the tests to check if a method
call was made. This isn't great as it's peeking deep into the
implementation, so we added some additional tests that ensured the
methods in question actually existed. Not perfect, but gives us some
confidence in the implementation.

While here, we were able to:

* Extract the stashing logic into a separate `stash_changes` helper
  method.

* Simplify the `cleanup_environment` logic to just use whether changes
  were stashed in order to decide whether to restore.

Closes #669.
---
 lib/overcommit/hook_context/pre_commit.rb     | 69 +++++++++----------
 .../hook_context/pre_commit_spec.rb           | 40 +++++++++++
 2 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/lib/overcommit/hook_context/pre_commit.rb b/lib/overcommit/hook_context/pre_commit.rb
index 99a7320c..6c73cb3b 100644
--- a/lib/overcommit/hook_context/pre_commit.rb
+++ b/lib/overcommit/hook_context/pre_commit.rb
@@ -49,29 +49,15 @@ def setup_environment
       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 @@ def setup_environment
     # 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 @@ def initial_commit?
 
     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 @@ def restore_working_tree
       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
diff --git a/spec/overcommit/hook_context/pre_commit_spec.rb b/spec/overcommit/hook_context/pre_commit_spec.rb
index 8e489962..dae42e66 100644
--- a/spec/overcommit/hook_context/pre_commit_spec.rb
+++ b/spec/overcommit/hook_context/pre_commit_spec.rb
@@ -158,6 +158,25 @@
       end
     end
 
+    context 'when all changes have been staged' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          `git add tracked-file`
+          `git commit -m "Add tracked-file"`
+          echo('Hello Other World', 'other-tracked-file')
+          `git add other-tracked-file`
+          example.run
+        end
+      end
+
+      it 'does not stash changes' do
+        expect(context.private_methods).to include :stash_changes
+        expect(context).not_to receive(:stash_changes)
+        subject
+      end
+    end
+
     context 'when renaming a file during an amendment' do
       around do |example|
         repo do
@@ -319,6 +338,27 @@
       end
     end
 
+    context 'when all changes were staged' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          `git add tracked-file`
+          `git commit -m "Add tracked-file"`
+          echo('Hello Other World', 'other-tracked-file')
+          `git add other-tracked-file`
+          example.run
+        end
+      end
+
+      it 'does not touch the working tree' do
+        expect(context.private_methods).to include :clear_working_tree
+        expect(context.private_methods).to include :restore_working_tree
+        expect(context).not_to receive(:clear_working_tree)
+        expect(context).not_to receive(:restore_working_tree)
+        subject
+      end
+    end
+
     context 'when there were deleted files' do
       around do |example|
         repo do

From d814682429a28ab662deced19e9937485a8f8593 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 28 Sep 2019 22:21:03 -0700
Subject: [PATCH 093/223] Remove CRLF warnings from AppVeyor builds

We get a lot of these warnings in our Windows tests.

    warning: CRLF will be replaced by LF in <file name>.
    The file will have its original line endings in your working directory.

Remove by adding this setting.
---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 6a06b6de..fcb90b95 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -51,6 +51,7 @@ before_test:
   - git config --global user.name "Appveyor CI"
 
   # Ignore CRLF conversion warnings
+  - git config --global core.autocrlf true
   - git config --global core.safecrlf false
 
 test_script:

From 8de3993de7666092b23b12cda8ee9f606dd01b8c Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 28 Sep 2019 23:07:45 -0700
Subject: [PATCH 094/223] Update change log with stashing fix

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 497d51c2..3e34f7d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Stop stashing in pre-commit hooks when all changes are already staged,
+  avoiding unnecessary file modification
+
 ## 0.50.0
 
 * Fix Overcommit to display helpful error message when a hook does not inherit

From e822bc06a4905f06b5582b13151f3643ea4d6f1f Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 28 Sep 2019 23:58:50 -0700
Subject: [PATCH 095/223] Provide better instructions on commit-msg failure

Modify on the technique introduced in #519 to instead provide clear
instructions on how to re-attempt your commit message starting from the
one you previously had.

This is instructional to users who aren't familiar with this feature of
Git.

Now commit-msg failures will be followed up with:

    Try again with your existing commit message by running:
    git commit --edit --file=.git/COMMIT_EDITMSG

The reason we don't attempt to simply re-open the editor is that by the
time we've failed the hook, Git has already decided the run has failed
and there is no means of recovery.

Closes #651.
---
 lib/overcommit/hook_context/commit_msg.rb       | 4 +++-
 spec/overcommit/hook_context/commit_msg_spec.rb | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/hook_context/commit_msg.rb b/lib/overcommit/hook_context/commit_msg.rb
index a8a11ac2..e73aa3ff 100644
--- a/lib/overcommit/hook_context/commit_msg.rb
+++ b/lib/overcommit/hook_context/commit_msg.rb
@@ -34,7 +34,9 @@ def commit_message_file
     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
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb
index 0e6535c2..2078f463 100644
--- a/spec/overcommit/hook_context/commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/commit_msg_spec.rb
@@ -92,7 +92,11 @@
     subject { context.post_fail_message }
 
     it 'returns printable log of commit message' do
-      subject.should == "Failed commit message:\nSome commit message\n"
+      subject.should start_with "Failed commit message:\nSome commit message\n"
+    end
+
+    it 'returns the command to run to restore the commit message' do
+      subject.should end_with "git commit --edit --file=#{commit_message_file}"
     end
   end
 end

From 2b5a66481e9dec5aab5932911aaec4333291f7dd Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 29 Sep 2019 00:30:13 -0700
Subject: [PATCH 096/223] Update change log with commit-msg instructions fix

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e34f7d7..9ac71007 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * Stop stashing in pre-commit hooks when all changes are already staged,
   avoiding unnecessary file modification
+* Improve instructions for recovering commit message when a `commit-msg` hook
+  fails
 
 ## 0.50.0
 

From 550f67f049922c2074d15e2b1d5e500c1bbd3b8f Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 2 Oct 2019 09:25:36 -0700
Subject: [PATCH 097/223] Cut version 0.51.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ac71007..b9309b56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.51.0
 
 * Stop stashing in pre-commit hooks when all changes are already staged,
   avoiding unnecessary file modification
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index d3004694..24650e15 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.50.0'
+  VERSION = '0.51.0'
 end

From 3822b1102b4778a879a5738b594d4b92c97efdc1 Mon Sep 17 00:00:00 2001
From: Dmitry Sinelnikov <dsinelnikov96@gmail>
Date: Sun, 13 Oct 2019 15:41:47 +0300
Subject: [PATCH 098/223] Fix markdown lint errors output #678

---
 lib/overcommit/hook/pre_commit/mdl.rb       | 6 +++---
 spec/overcommit/hook/pre_commit/mdl_spec.rb | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/mdl.rb b/lib/overcommit/hook/pre_commit/mdl.rb
index 4759936e..56349d72 100644
--- a/lib/overcommit/hook/pre_commit/mdl.rb
+++ b/lib/overcommit/hook/pre_commit/mdl.rb
@@ -19,9 +19,9 @@ def run
       json_messages.map do |message|
         Overcommit::Hook::Message.new(
           :error,
-          message[:filename],
-          message[:line],
-          message[:description]
+          message['filename'],
+          message['line'],
+          "#{message['filename']}:#{message['line']} #{message['rule']} #{message['description']}"
         )
       end
     end
diff --git a/spec/overcommit/hook/pre_commit/mdl_spec.rb b/spec/overcommit/hook/pre_commit/mdl_spec.rb
index e84b52cc..119f9a00 100644
--- a/spec/overcommit/hook/pre_commit/mdl_spec.rb
+++ b/spec/overcommit/hook/pre_commit/mdl_spec.rb
@@ -25,6 +25,7 @@
 
   context 'when mdl exits unsuccessfully' do
     let(:success) { false }
+    let(:message) { subject.run.last }
 
     context 'and it reports an error' do
       let(:stdout) do
@@ -34,6 +35,9 @@
       let(:stderr) { '' }
 
       it { should fail_hook }
+      it { expect(message.file).to eq 'file1.md' }
+      it { expect(message.line).to eq 1 }
+      it { expect(message.content).to eq 'file1.md:1 MD013 Line length' }
     end
 
     context 'when there is an error running mdl' do
@@ -41,6 +45,7 @@
       let(:stderr) { 'Some runtime error' }
 
       it { should fail_hook }
+      it { expect(message).to eq 'Some runtime error' }
     end
   end
 end

From 24ad34ac2cd2d3577ad2e7af6a0f088500236f2a Mon Sep 17 00:00:00 2001
From: Taufek Johar <taufek@gmail.com>
Date: Mon, 14 Oct 2019 00:02:15 +0800
Subject: [PATCH 099/223] Add Test on Hook Base "run?" Method

Context
=
Add test before updating the method in other PR.
---
 spec/overcommit/hook/base_spec.rb | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/spec/overcommit/hook/base_spec.rb b/spec/overcommit/hook/base_spec.rb
index 012b764c..b1923ffd 100644
--- a/spec/overcommit/hook/base_spec.rb
+++ b/spec/overcommit/hook/base_spec.rb
@@ -34,4 +34,51 @@
       end
     end
   end
+
+  describe '#run?' do
+    let(:modified_files) { [] }
+    let(:hook_config) do
+      {
+        'enabled' => enabled,
+        'requires_files' => requires_files,
+      }
+    end
+
+    before do
+      config.stub(:for_hook).and_return(hook_config)
+      context.stub(:modified_files).and_return(modified_files)
+    end
+
+    subject { hook.run? }
+
+    context 'enabled is true, requires_files is false, modified_files empty' do
+      let(:enabled) { true }
+      let(:requires_files) { false }
+
+      it { subject.should == true }
+    end
+
+    context 'enabled is false, requires_files is false, modified_files empty' do
+      let(:enabled) { false }
+      let(:requires_files) { false }
+
+      it { subject.should == false }
+    end
+
+    context 'enabled is true, requires_files is true, modified_files is not empty' do
+      let(:enabled) { true }
+      let(:requires_files) { true }
+      let(:modified_files) { ['file1'] }
+
+      it { subject.should == true }
+    end
+
+    context 'enabled is true, requires_files is false, modified_files is not empty' do
+      let(:enabled) { true }
+      let(:requires_files) { false }
+      let(:modified_files) { ['file1'] }
+
+      it { subject.should == true }
+    end
+  end
 end

From 02e54be8ddcdf18ae344e2e1464ca472506dc326 Mon Sep 17 00:00:00 2001
From: Dmitry Sinelnikov <dsinelnikov96@gmail>
Date: Sun, 13 Oct 2019 19:59:19 +0300
Subject: [PATCH 100/223] Add support for golangci-lint #680

---
 config/default.yml                            | 17 ++++
 .../hook/pre_commit/golangci_lint.rb          | 21 ++++
 lib/overcommit/hook/pre_push/golangci_lint.rb | 16 +++
 .../hook/pre_commit/golangci_lint_spec.rb     | 98 +++++++++++++++++++
 .../hook/pre_push/golangci_lint_spec.rb       | 68 +++++++++++++
 5 files changed, 220 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/golangci_lint.rb
 create mode 100644 lib/overcommit/hook/pre_push/golangci_lint.rb
 create mode 100644 spec/overcommit/hook/pre_commit/golangci_lint_spec.rb
 create mode 100644 spec/overcommit/hook/pre_push/golangci_lint_spec.rb

diff --git a/config/default.yml b/config/default.yml
index 02777c7e..98f495e1 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -337,6 +337,15 @@ PreCommit:
     flags: ['-IEHnw']
     keywords: ['FContext','FDescribe','FIt','FMeasure','FSpecify','FWhen']
 
+  GolangciLint:
+    enabled: false
+    description: 'Analyze with golangci-lint'
+    required_executable: 'golangci-lint'
+    install_command: 'go get github.com/golangci/golangci-lint/cmd/golangci-lint'
+    flags: ['--out-format=line-number', '--print-issued-lines=false']
+    command: ['golangci-lint', 'run']
+    include: '**/*.go'
+
   GoLint:
     enabled: false
     description: 'Analyze with golint'
@@ -1253,6 +1262,14 @@ PrePush:
     required_executable: 'git-lfs'
     install_command: 'brew install git-lfs'
 
+  GolangciLint:
+    enabled: false
+    description: 'Analyze with golangci-lint'
+    required_executable: 'golangci-lint'
+    install_command: 'go get github.com/golangci/golangci-lint/cmd/golangci-lint'
+    flags: ['--out-format=line-number', '--print-issued-lines=false']
+    command: ['golangci-lint', 'run']
+
   Minitest:
     enabled: false
     description: 'Run Minitest test suite'
diff --git a/lib/overcommit/hook/pre_commit/golangci_lint.rb b/lib/overcommit/hook/pre_commit/golangci_lint.rb
new file mode 100644
index 00000000..6dffe659
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/golangci_lint.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `golangci-lint run` against any modified packages
+  #
+  # @see https://github.com/golangci/golangci-lint
+  class GolangciLint < Base
+    def run
+      packages = applicable_files.map { |f| File.dirname(f) }.uniq
+      result = execute(command, args: packages)
+      return :pass if result.success?
+      return [:fail, result.stderr] unless result.stderr.empty?
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/,
+        nil
+      )
+    end
+  end
+end
diff --git a/lib/overcommit/hook/pre_push/golangci_lint.rb b/lib/overcommit/hook/pre_push/golangci_lint.rb
new file mode 100644
index 00000000..42df41b0
--- /dev/null
+++ b/lib/overcommit/hook/pre_push/golangci_lint.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs golangci-lint
+  #
+  # @see https://github.com/golangci/golangci-lint
+  class GolangciLint < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/golangci_lint_spec.rb b/spec/overcommit/hook/pre_commit/golangci_lint_spec.rb
new file mode 100644
index 00000000..45e4a7e3
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/golangci_lint_spec.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::GolangciLint do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  let(:files) do
+    %w[
+      pkg1/file1.go
+      pkg1/file2.go
+      pkg2/file1.go
+      file1.go
+    ]
+  end
+  let(:packages) { %w[pkg1 pkg2 .] }
+  before do
+    subject.stub(:applicable_files).and_return(files)
+  end
+
+  context 'when golangci-lint exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(success?: true, stderr: '', stdout: '')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it 'passes packages to golangci-lint' do
+      expect(subject).to receive(:execute).with(subject.command, args: packages)
+      subject.run
+    end
+
+    it 'passes' do
+      expect(subject).to pass
+    end
+  end
+
+  context 'when golangci-lint exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'when golangci-lint returns an error' do
+      let(:error_message) do
+        'pkg1/file1.go:8:6: exported type `Test` should have comment or be unexported (golint)'
+      end
+
+      before do
+        result.stub(:stdout).and_return(error_message)
+        result.stub(:stderr).and_return('')
+      end
+
+      it 'passes packages to golangci-lint' do
+        expect(subject).to receive(:execute).with(subject.command, args: packages)
+        subject.run
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message.file).to eq 'pkg1/file1.go'
+        expect(message.line).to eq 8
+        expect(message.content).to eq error_message
+      end
+    end
+
+    context 'when a generic error message is written to stderr' do
+      let(:error_message) { 'golangci-lint: command not found' }
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return(error_message)
+      end
+
+      it 'passes packages to golangci-lint' do
+        expect(subject).to receive(:execute).with(subject.command, args: packages)
+        subject.run
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message).to eq error_message
+      end
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/golangci_lint_spec.rb b/spec/overcommit/hook/pre_push/golangci_lint_spec.rb
new file mode 100644
index 00000000..bf4bed5f
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/golangci_lint_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::GolangciLint do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  context 'when golangci-lint exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(success?: true, stderr: '', stdout: '')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it 'passes' do
+      expect(subject).to pass
+    end
+  end
+
+  context 'when golangci-lint exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'when golangci-lint returns an error' do
+      let(:error_message) do
+        'pkg1/file1.go:8:6: exported type `Test` should have comment or be unexported (golint)'
+      end
+
+      before do
+        result.stub(:stdout).and_return(error_message)
+        result.stub(:stderr).and_return('')
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message).to eq error_message
+      end
+    end
+
+    context 'when a generic error message is written to stderr' do
+      let(:error_message) { 'golangci-lint: command not found' }
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return(error_message)
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message).to eq error_message
+      end
+    end
+  end
+end

From f0873787f75390b08e9293b2b2d9c9e61f4c88d9 Mon Sep 17 00:00:00 2001
From: Dmitry Sinelnikov <dsinelnikov96@gmail>
Date: Sun, 13 Oct 2019 21:06:01 +0300
Subject: [PATCH 101/223] Add support for go test #685

---
 config/default.yml                            |  6 ++
 lib/overcommit/hook/pre_push/go_test.rb       | 14 ++++
 spec/overcommit/hook/pre_push/go_test_spec.rb | 66 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_push/go_test.rb
 create mode 100644 spec/overcommit/hook/pre_push/go_test_spec.rb

diff --git a/config/default.yml b/config/default.yml
index 98f495e1..296d1477 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1270,6 +1270,12 @@ PrePush:
     flags: ['--out-format=line-number', '--print-issued-lines=false']
     command: ['golangci-lint', 'run']
 
+  GoTest:
+    enabled: false
+    description: 'Run go test suite'
+    required_executable: 'go'
+    command: ['go', 'test', './...']
+
   Minitest:
     enabled: false
     description: 'Run Minitest test suite'
diff --git a/lib/overcommit/hook/pre_push/go_test.rb b/lib/overcommit/hook/pre_push/go_test.rb
new file mode 100644
index 00000000..b6b732a6
--- /dev/null
+++ b/lib/overcommit/hook/pre_push/go_test.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs `go test ./...` command on prepush
+  class GoTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/go_test_spec.rb b/spec/overcommit/hook/pre_push/go_test_spec.rb
new file mode 100644
index 00000000..19bc4d0d
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/go_test_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::GoTest do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  context 'when go test exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(success?: true, stderr: '', stdout: '')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it 'passes' do
+      expect(subject).to pass
+    end
+  end
+
+  context 'when go test exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'when go test returns an error' do
+      let(:error_message) { "--- FAIL: Test1 (0.00s)\nFAIL" }
+
+      before do
+        result.stub(:stdout).and_return(error_message)
+        result.stub(:stderr).and_return('')
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message).to eq error_message
+      end
+    end
+
+    context 'when a generic error message is written to stderr' do
+      let(:error_message) { 'go: command not found' }
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return(error_message)
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message).to eq error_message
+      end
+    end
+  end
+end

From e995ee56b46b50b402fd63f9392c8bf0a0b88d51 Mon Sep 17 00:00:00 2001
From: Dmitry Sinelnikov <dsinelnikov96@gmail>
Date: Sun, 13 Oct 2019 22:58:23 +0300
Subject: [PATCH 102/223] Add support for go fmt #687

---
 config/default.yml                            |  8 ++
 lib/overcommit/hook/pre_commit/go_fmt.rb      | 17 ++++
 .../overcommit/hook/pre_commit/go_fmt_spec.rb | 99 +++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/go_fmt.rb
 create mode 100644 spec/overcommit/hook/pre_commit/go_fmt_spec.rb

diff --git a/config/default.yml b/config/default.yml
index 296d1477..5a6887f4 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -337,6 +337,14 @@ PreCommit:
     flags: ['-IEHnw']
     keywords: ['FContext','FDescribe','FIt','FMeasure','FSpecify','FWhen']
 
+  GoFmt:
+    enabled: true
+    description: 'Fix with go fmt'
+    required_executable: 'go'
+    command: ['go', 'fmt']
+    parallelize: false
+    include: '**/*.go'
+
   GolangciLint:
     enabled: false
     description: 'Analyze with golangci-lint'
diff --git a/lib/overcommit/hook/pre_commit/go_fmt.rb b/lib/overcommit/hook/pre_commit/go_fmt.rb
new file mode 100644
index 00000000..0f46a18e
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/go_fmt.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs go fmt for all modified Go files
+  class GoFmt < Base
+    def run
+      errors = []
+      applicable_files.each do |file|
+        result = execute(command, args: [file])
+        errors << (result.stdout + result.stderr) unless result.success?
+      end
+      return :pass if errors.empty?
+
+      [:fail, errors.join("\n")]
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/go_fmt_spec.rb b/spec/overcommit/hook/pre_commit/go_fmt_spec.rb
new file mode 100644
index 00000000..496ca097
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/go_fmt_spec.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::GoFmt do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  let(:files) do
+    %w[
+      pkg1/file1.go
+      pkg1/file2.go
+      pkg2/file1.go
+      file1.go
+    ]
+  end
+  before do
+    subject.stub(:applicable_files).and_return(files)
+  end
+
+  context 'when go fmt exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(success?: true, stderr: '', stdout: '')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it 'executes go fmt for each file' do
+      files.each do |file|
+        expect(subject).to receive(:execute).with(subject.command, args: [file]).once
+      end
+      subject.run
+    end
+
+    it 'passes' do
+      expect(subject).to pass
+    end
+  end
+
+  context 'when go fmt exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'when go fmt returns an error to stdout' do
+      let(:error_message) { 'some go fmt error' }
+
+      before do
+        result.stub(:stdout).and_return(error_message)
+        result.stub(:stderr).and_return('')
+      end
+
+      it 'executes go fmt for each file' do
+        files.each do |file|
+          expect(subject).to receive(:execute).with(subject.command, args: [file]).once
+        end
+        subject.run
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns errors' do
+        message = subject.run.last
+        expect(message).to eq Array.new(files.count, error_message).join("\n")
+      end
+    end
+
+    context 'when fo fmt returns an error to stderr' do
+      let(:error_message) { 'go: command not found' }
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return(error_message)
+      end
+
+      it 'executes go fmt for each file' do
+        files.each do |file|
+          expect(subject).to receive(:execute).with(subject.command, args: [file]).once
+        end
+        subject.run
+      end
+
+      it 'fails' do
+        expect(subject).to fail_hook
+      end
+
+      it 'returns valid message' do
+        message = subject.run.last
+        expect(message).to eq Array.new(files.count, error_message).join("\n")
+      end
+    end
+  end
+end

From 8e0191ae46b7da99975f3f207ee78bd4b01d33fc Mon Sep 17 00:00:00 2001
From: Taufek Johar <taufek@gmail.com>
Date: Sun, 13 Oct 2019 22:02:48 +0800
Subject: [PATCH 103/223] Introduce `exclude_branch_patterns` on Hook Config

Context
=
This will allow user to skip any Hook based on branch patterns.

For example, if the user wish to skip a particular Hook (i.e. Rubocop) for `staging` branch,
the user could specify below

```
PreCommit:
  Rubocop:
   exclude_branch_patterns: ['staging']
```
or using glob partial pattern

```
PreCommit:
  Rubocop:
   exclude_branch_patterns: ['stag*']
```

By default `exclude_branch_patterns` is empty (includes all branches).
---
 lib/overcommit/hook/base.rb       | 13 ++++++++++
 spec/overcommit/hook/base_spec.rb | 41 +++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index bd1954d3..bcdb02a8 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -79,12 +79,17 @@ def enabled?
       @config['enabled'] != false
     end
 
+    def excluded?
+      exclude_branch_patterns.any? { |p| File.fnmatch(p, current_branch) }
+    end
+
     def skip?
       @config['skip']
     end
 
     def run?
       enabled? &&
+      !excluded? &&
         !(@config['requires_files'] && applicable_files.empty?)
     end
 
@@ -276,5 +281,13 @@ def transform_status(status)
         status
       end
     end
+
+    def exclude_branch_patterns
+      @config['exclude_branch_patterns'] || []
+    end
+
+    def current_branch
+      @current_branch ||= Overcommit::GitRepo.current_branch
+    end
   end
 end
diff --git a/spec/overcommit/hook/base_spec.rb b/spec/overcommit/hook/base_spec.rb
index b1923ffd..685c3590 100644
--- a/spec/overcommit/hook/base_spec.rb
+++ b/spec/overcommit/hook/base_spec.rb
@@ -80,5 +80,46 @@
 
       it { subject.should == true }
     end
+
+    context 'with exclude_branch_patterns specified' do
+      let(:current_branch) { 'test-branch' }
+      let(:hook_config) do
+        {
+          'enabled' => true,
+          'requires_files' => false,
+          'exclude_branch_patterns' => exclude_branch_patterns
+        }
+      end
+
+      before do
+        allow(Overcommit::GitRepo).
+          to receive(:current_branch).
+          and_return(current_branch)
+      end
+
+      context 'exclude_branch_patterns is nil' do
+        let(:exclude_branch_patterns) { nil }
+
+        it { subject.should == true }
+      end
+
+      context 'exact match between exclude_branch_patterns and current_branch' do
+        let(:exclude_branch_patterns) { ['test-branch'] }
+
+        it { subject.should == false }
+      end
+
+      context 'partial match between exclude_branch_patterns and current_branch' do
+        let(:exclude_branch_patterns) { ['test-*'] }
+
+        it { subject.should == false }
+      end
+
+      context 'non-match between exclude_branch_patterns and current_branch' do
+        let(:exclude_branch_patterns) { ['no-test-*'] }
+
+        it { subject.should == true }
+      end
+    end
   end
 end

From a11eba0f45a45f53f93c75fd5826b19c0c0a565a Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 13 Oct 2019 17:50:12 -0700
Subject: [PATCH 104/223] Update change log

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9309b56..6454b341 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix `Mdl` to properly parse JSON output from `mdl`
+* Add `GolangciLint` pre-commit and pre-push hooks
+* Add `GoTest` pre-push hook
+* Add `GoFmt` pre-commit hook
+* Add `excluded_branch_patterns` hook option to disable hooks running on specific branches
+
 ## 0.51.0
 
 * Stop stashing in pre-commit hooks when all changes are already staged,

From 19c761de6fdc93de04fbcbffc26f20b48f713766 Mon Sep 17 00:00:00 2001
From: Taufek Johar <taufek@gmail.com>
Date: Mon, 14 Oct 2019 14:27:32 +0800
Subject: [PATCH 105/223] Update Doc on "exclude_branch_patterns" config

Context
-
Update readme on above config that was added in below PR.

https://github.com/sds/overcommit/pull/681
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bd064835..b99069f7 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,7 @@ Option                                  | Description
 `requires_files`                        | If `true`, this hook runs only if files that are applicable to it have been modified. See `include` and `exclude` for how to specify applicable files.
 `include`                               | File paths or glob patterns of files that apply to this hook. The hook will only run on the applicable files when they have been modified. Note that the concept of modified varies for different types of hooks. By default, `include` matches every file until you specify a list of patterns.
 `exclude`                               | File paths or glob patterns of files that do not apply to this hook. This is used to exclude any files that would have been matched by `include`.
+`exclude_branch_patterns`               | List of branch names or glob patterns of branches that do not apply to this hook.
 `problem_on_unmodified_line`            | How to treat errors reported on lines that weren't modified during the action captured by this hook (e.g. for pre-commit hooks, warnings/errors reported on lines that were not staged with `git add` may not be warnings/errors you care about). Valid values are `report`: report errors/warnings as-is regardless of line location (default); `warn`: report errors as warnings if they are on lines you didn't modify; and `ignore`: don't display errors/warnings at all if they are on lines you didn't modify (`ignore` is _not_ recommended).
 `on_fail`                               | Change the status of a failed hook to `warn` or `pass`. This allows you to treat failures as warnings or potentially ignore them entirely, but you should use caution when doing so as you might be hiding important information.
 `on_warn`                               | Similar to `on_fail`, change the status of a hook that returns a warning status to either `pass` (you wish to silence warnings entirely) or `fail` (you wish to treat all warnings as errors).

From 5880c2c74c824c8ce5051bf1eafcadc946a805c0 Mon Sep 17 00:00:00 2001
From: Taufek Johar <taufek@gmail.com>
Date: Mon, 14 Oct 2019 00:02:15 +0800
Subject: [PATCH 106/223] Introduce "exclude_remote_names" to Skip Hook During
 PrePush Based on Remote Name

Context
=
Allow user to skip certain Hooks when pushing changes to certain remote repository.

For example, user could a Hook (i.e. RSpec), when pushing to 'heroku' remote name.
```
PrePush:
  RSpec:
    exclude_remote_names: ['heroku']
```
---
 lib/overcommit/hook/base.rb                |  4 ++
 lib/overcommit/hook/pre_push/base.rb       |  4 ++
 spec/overcommit/hook/pre_push/base_spec.rb | 83 ++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 spec/overcommit/hook/pre_push/base_spec.rb

diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index bcdb02a8..d65d4c2f 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -286,6 +286,10 @@ def exclude_branch_patterns
       @config['exclude_branch_patterns'] || []
     end
 
+    def exclude_remote_names
+      @config['exclude_remote_names'] || []
+    end
+
     def current_branch
       @current_branch ||= Overcommit::GitRepo.current_branch
     end
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 3b27f23f..00ad94dc 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -8,5 +8,9 @@ class Base < Overcommit::Hook::Base
     extend Forwardable
 
     def_delegators :@context, :remote_name, :remote_url, :pushed_refs
+
+    def skip?
+      super || exclude_remote_names.include?(remote_name)
+    end
   end
 end
diff --git a/spec/overcommit/hook/pre_push/base_spec.rb b/spec/overcommit/hook/pre_push/base_spec.rb
new file mode 100644
index 00000000..972d49dc
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/base_spec.rb
@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::Base do
+  let(:remote_name) { 'origin' }
+  let(:config) { double('config') }
+  let(:context) { double('context') }
+  let(:hook) { described_class.new(config, context) }
+  describe '#run?' do
+    let(:hook_config) do
+      { 'skip' => skip }
+    end
+
+    before do
+      allow(context).to receive(:remote_name).and_return(remote_name)
+      allow(config).to receive(:for_hook).and_return(hook_config)
+    end
+
+    subject { hook.skip? }
+
+    context 'skip is true' do
+      let(:skip) { true }
+
+      it { subject.should == true }
+    end
+
+    context 'skip is false' do
+      let(:skip) { false }
+
+      it { subject.should == false }
+    end
+
+    context 'with exclude_remote_names specified' do
+      let(:hook_config) do
+        { 'skip' => skip, 'exclude_remote_names' => exclude_remote_names }
+      end
+      let(:exclude_remote_names) { nil }
+
+      context 'skip is true and exclude_remote_names is nil' do
+        let(:skip) { true }
+        let(:exclude_remote_names) { nil }
+
+        it { subject.should == true }
+      end
+
+      context 'skip is false and exclude_remote_names is nil' do
+        let(:skip) { false }
+        let(:exclude_remote_names) { nil }
+
+        it { subject.should == false }
+      end
+
+      context 'skip is true and matching exclude_remote_names is nil' do
+        let(:skip) { true }
+        let(:exclude_remote_names) { ['origin'] }
+
+        it { subject.should == true }
+      end
+
+      context 'skip is false and matching exclude_remote_names is nil' do
+        let(:skip) { false }
+        let(:exclude_remote_names) { ['origin'] }
+
+        it { subject.should == true }
+      end
+
+      context 'skip is true and non-matching exclude_remote_names is nil' do
+        let(:skip) { true }
+        let(:exclude_remote_names) { ['heroku'] }
+
+        it { subject.should == true }
+      end
+
+      context 'skip is false and non-matching exclude_remote_names is nil' do
+        let(:skip) { false }
+        let(:exclude_remote_names) { ['heroku'] }
+
+        it { subject.should == false }
+      end
+    end
+  end
+end

From e7b890706cc489aaa33f9f583fff85c4004426a0 Mon Sep 17 00:00:00 2001
From: Taufek Johar <taufek@gmail.com>
Date: Mon, 14 Oct 2019 14:53:08 +0800
Subject: [PATCH 107/223] Introduce 'ignore_branch_deletions' Config for
 PrePush Hooks

Context
=
There are scenario we would like to skip pre-push Hooks when deleting remote branch.

Below is an example of git command to delete remote branch.

```
git push origin :to-be-deleted-branch
```

When we set `ignore_branch_deletions` as true for a PrePush Hook,
it will be skipped during remote branch deletion.
---
 lib/overcommit/hook/pre_push/base.rb          | 14 ++-
 lib/overcommit/hook_context/pre_push.rb       |  9 ++
 spec/overcommit/hook/pre_push/base_spec.rb    | 86 ++++++++++++++++++-
 spec/overcommit/hook_context/pre_push_spec.rb | 35 ++++++++
 4 files changed, 139 insertions(+), 5 deletions(-)

diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 00ad94dc..95f5bab5 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -10,7 +10,19 @@ class Base < Overcommit::Hook::Base
     def_delegators :@context, :remote_name, :remote_url, :pushed_refs
 
     def skip?
-      super || exclude_remote_names.include?(remote_name)
+      super ||
+        exclude_remote_names.include?(remote_name) ||
+        skip_for_remote_branch_deletion?
+    end
+
+    private
+
+    def skip_for_remote_branch_deletion?
+      ignore_branch_deletions? && @context.remote_branch_deletion?
+    end
+
+    def ignore_branch_deletions?
+      @config['ignore_branch_deletions'] != false
     end
   end
 end
diff --git a/lib/overcommit/hook_context/pre_push.rb b/lib/overcommit/hook_context/pre_push.rb
index 715e5918..363afb6d 100644
--- a/lib/overcommit/hook_context/pre_push.rb
+++ b/lib/overcommit/hook_context/pre_push.rb
@@ -13,6 +13,15 @@ def remote_url
       @args[1]
     end
 
+    def remote_branch_deletion?
+      return @remote_branch_deletion if defined? @remote_branch_deletion
+
+      @remote_branch_deletion ||= input_lines.
+                                  first.
+                                  split(' ').
+                                  first == '(deleted)'
+    end
+
     def pushed_refs
       input_lines.map do |line|
         PushedRef.new(*line.split(' '))
diff --git a/spec/overcommit/hook/pre_push/base_spec.rb b/spec/overcommit/hook/pre_push/base_spec.rb
index 972d49dc..040ebbf5 100644
--- a/spec/overcommit/hook/pre_push/base_spec.rb
+++ b/spec/overcommit/hook/pre_push/base_spec.rb
@@ -4,6 +4,7 @@
 
 describe Overcommit::Hook::PrePush::Base do
   let(:remote_name) { 'origin' }
+  let(:remote_branch_deletion?) { false }
   let(:config) { double('config') }
   let(:context) { double('context') }
   let(:hook) { described_class.new(config, context) }
@@ -14,6 +15,7 @@
 
     before do
       allow(context).to receive(:remote_name).and_return(remote_name)
+      allow(context).to receive(:remote_branch_deletion?).and_return(remote_branch_deletion?)
       allow(config).to receive(:for_hook).and_return(hook_config)
     end
 
@@ -47,8 +49,6 @@
       context 'skip is false and exclude_remote_names is nil' do
         let(:skip) { false }
         let(:exclude_remote_names) { nil }
-
-        it { subject.should == false }
       end
 
       context 'skip is true and matching exclude_remote_names is nil' do
@@ -61,8 +61,6 @@
       context 'skip is false and matching exclude_remote_names is nil' do
         let(:skip) { false }
         let(:exclude_remote_names) { ['origin'] }
-
-        it { subject.should == true }
       end
 
       context 'skip is true and non-matching exclude_remote_names is nil' do
@@ -79,5 +77,85 @@
         it { subject.should == false }
       end
     end
+
+    context 'with ignore_branch_deletions specified' do
+      let(:hook_config) do
+        { 'skip' => skip, 'ignore_branch_deletions' => ignore_branch_deletions }
+      end
+      let(:remote_branch_deletion?) { false }
+      let(:ignore_branch_deletions) { false }
+
+      context(<<~DESC) do
+        skip is true and
+        remote_branch_deletion? is false and
+        ignore_branch_deletions false' do
+      DESC
+        let(:skip) { true }
+        let(:remote_branch_deletion?) { false }
+        let(:ignore_branch_deletions) { nil }
+
+        it { subject.should == true }
+      end
+
+      context(<<~DESC) do
+        skip is false and
+        remote_branch_deletion? is false and
+        ignore_branch_deletions false' do
+      DESC
+        let(:skip) { false }
+        let(:remote_branch_deletion?) { false }
+        let(:ignore_branch_deletions) { false }
+
+        it { subject.should == false }
+      end
+
+      context(<<~DESC) do
+        skip is false and
+        remote_branch_deletion? is true and
+        ignore_branch_deletions false' do
+      DESC
+        let(:skip) { false }
+        let(:remote_branch_deletion?) { true }
+        let(:ignore_branch_deletions) { false }
+
+        it { subject.should == false }
+      end
+
+      context(<<~DESC) do
+        skip is false and
+        remote_branch_deletion? is true and
+        ignore_branch_deletions true' do
+      DESC
+        let(:skip) { false }
+        let(:remote_branch_deletion?) { true }
+        let(:ignore_branch_deletions) { true }
+
+        it { subject.should == true }
+      end
+
+      context(<<~DESC) do
+        skip is false and
+        remote_branch_deletion? is false and
+        ignore_branch_deletions true' do
+      DESC
+        let(:skip) { false }
+        let(:remote_branch_deletion?) { false }
+        let(:ignore_branch_deletions) { true }
+
+        it { subject.should == false }
+      end
+
+      context(<<-DESC) do
+        skip is true and
+        remote_branch_deletion? is true and
+        ignore_branch_deletions true' do
+      DESC
+        let(:skip) { true }
+        let(:remote_branch_deletion?) { true }
+        let(:ignore_branch_deletions) { true }
+
+        it { subject.should == true }
+      end
+    end
   end
 end
diff --git a/spec/overcommit/hook_context/pre_push_spec.rb b/spec/overcommit/hook_context/pre_push_spec.rb
index a8706e04..f8958059 100644
--- a/spec/overcommit/hook_context/pre_push_spec.rb
+++ b/spec/overcommit/hook_context/pre_push_spec.rb
@@ -23,6 +23,41 @@
     it { should == remote_url }
   end
 
+  describe '#remote_branch_deletion?' do
+    subject { context.remote_branch_deletion? }
+
+    before do
+      input.stub(:read).and_return("#{local_ref} #{local_sha1} #{remote_ref} #{remote_sha1}\n")
+    end
+
+    context 'when pushing new branch to remote ref' do
+      let(:local_ref) { 'refs/heads/test' }
+      let(:local_sha1) { '' }
+      let(:remote_ref) { 'refs/heads/test' }
+      let(:remote_sha1) { '0' * 40 }
+
+      it { should == false }
+    end
+
+    context 'when pushing update to remote ref' do
+      let(:local_ref) { 'refs/heads/test' }
+      let(:local_sha1) { '' }
+      let(:remote_ref) { 'refs/heads/test' }
+      let(:remote_sha1) { random_hash }
+
+      it { should == false }
+    end
+
+    context 'when deleting remote ref' do
+      let(:local_ref) { '(deleted)' }
+      let(:local_sha1) { '' }
+      let(:remote_ref) { 'refs/heads/test' }
+      let(:remote_sha1) { random_hash }
+
+      it { should == true }
+    end
+  end
+
   describe '#pushed_refs' do
     subject(:pushed_refs) { context.pushed_refs }
 

From 3774e26a2dbe503fcc1cf5cb1103c81705a20d1f Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 19:37:13 -0700
Subject: [PATCH 108/223] Remove Twitter account

We don't use this anymore.
---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index b99069f7..9ba47ee1 100644
--- a/README.md
+++ b/README.md
@@ -714,8 +714,6 @@ ensure your thoughts, ideas, or code get merged.
 All major discussion surrounding Overcommit happens on the
 [GitHub issues list](https://github.com/sds/overcommit/issues).
 
-You can also follow [@git_overcommit on Twitter](https://twitter.com/git_overcommit).
-
 ## Changelog
 
 If you're interested in seeing the changes and bug fixes between each version

From 3c19e4cb2900013c1eb82d0012ce17d3f1bf4e91 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 19:42:58 -0700
Subject: [PATCH 109/223] Move exclude_remote_names definition to PrePush base

This doesn't need to be in the base hook since it's used only in
`pre-push` hooks.
---
 lib/overcommit/hook/base.rb          | 4 ----
 lib/overcommit/hook/pre_push/base.rb | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index d65d4c2f..bcdb02a8 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -286,10 +286,6 @@ def exclude_branch_patterns
       @config['exclude_branch_patterns'] || []
     end
 
-    def exclude_remote_names
-      @config['exclude_remote_names'] || []
-    end
-
     def current_branch
       @current_branch ||= Overcommit::GitRepo.current_branch
     end
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 95f5bab5..05113a03 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -21,6 +21,10 @@ def skip_for_remote_branch_deletion?
       ignore_branch_deletions? && @context.remote_branch_deletion?
     end
 
+    def exclude_remote_names
+      @config['exclude_remote_names'] || []
+    end
+
     def ignore_branch_deletions?
       @config['ignore_branch_deletions'] != false
     end

From 13068abe751b286618de5854b33f6f47895675eb Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 19:52:47 -0700
Subject: [PATCH 110/223] Rename exclude_remote_names to exclude_remotes

This is more concise.
---
 README.md                                  |  1 +
 lib/overcommit/hook/pre_push/base.rb       |  6 ++---
 spec/overcommit/hook/pre_push/base_spec.rb | 30 +++++++++++-----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 9ba47ee1..4edb82d2 100644
--- a/README.md
+++ b/README.md
@@ -227,6 +227,7 @@ Option                                  | Description
 `include`                               | File paths or glob patterns of files that apply to this hook. The hook will only run on the applicable files when they have been modified. Note that the concept of modified varies for different types of hooks. By default, `include` matches every file until you specify a list of patterns.
 `exclude`                               | File paths or glob patterns of files that do not apply to this hook. This is used to exclude any files that would have been matched by `include`.
 `exclude_branch_patterns`               | List of branch names or glob patterns of branches that do not apply to this hook.
+`exclude_remotes`                       | *`PrePush` hooks only.* List of remote names that the hook should not run against.
 `problem_on_unmodified_line`            | How to treat errors reported on lines that weren't modified during the action captured by this hook (e.g. for pre-commit hooks, warnings/errors reported on lines that were not staged with `git add` may not be warnings/errors you care about). Valid values are `report`: report errors/warnings as-is regardless of line location (default); `warn`: report errors as warnings if they are on lines you didn't modify; and `ignore`: don't display errors/warnings at all if they are on lines you didn't modify (`ignore` is _not_ recommended).
 `on_fail`                               | Change the status of a failed hook to `warn` or `pass`. This allows you to treat failures as warnings or potentially ignore them entirely, but you should use caution when doing so as you might be hiding important information.
 `on_warn`                               | Similar to `on_fail`, change the status of a hook that returns a warning status to either `pass` (you wish to silence warnings entirely) or `fail` (you wish to treat all warnings as errors).
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 05113a03..32a8baf3 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -11,7 +11,7 @@ class Base < Overcommit::Hook::Base
 
     def skip?
       super ||
-        exclude_remote_names.include?(remote_name) ||
+        exclude_remotes.include?(remote_name) ||
         skip_for_remote_branch_deletion?
     end
 
@@ -21,8 +21,8 @@ def skip_for_remote_branch_deletion?
       ignore_branch_deletions? && @context.remote_branch_deletion?
     end
 
-    def exclude_remote_names
-      @config['exclude_remote_names'] || []
+    def exclude_remotes
+      @config['exclude_remotes'] || []
     end
 
     def ignore_branch_deletions?
diff --git a/spec/overcommit/hook/pre_push/base_spec.rb b/spec/overcommit/hook/pre_push/base_spec.rb
index 040ebbf5..8f4309ff 100644
--- a/spec/overcommit/hook/pre_push/base_spec.rb
+++ b/spec/overcommit/hook/pre_push/base_spec.rb
@@ -33,46 +33,46 @@
       it { subject.should == false }
     end
 
-    context 'with exclude_remote_names specified' do
+    context 'with exclude_remotes specified' do
       let(:hook_config) do
-        { 'skip' => skip, 'exclude_remote_names' => exclude_remote_names }
+        { 'skip' => skip, 'exclude_remotes' => exclude_remotes }
       end
-      let(:exclude_remote_names) { nil }
+      let(:exclude_remotes) { nil }
 
-      context 'skip is true and exclude_remote_names is nil' do
+      context 'skip is true and exclude_remotes is nil' do
         let(:skip) { true }
-        let(:exclude_remote_names) { nil }
+        let(:exclude_remotes) { nil }
 
         it { subject.should == true }
       end
 
-      context 'skip is false and exclude_remote_names is nil' do
+      context 'skip is false and exclude_remotes is nil' do
         let(:skip) { false }
-        let(:exclude_remote_names) { nil }
+        let(:exclude_remotes) { nil }
       end
 
-      context 'skip is true and matching exclude_remote_names is nil' do
+      context 'skip is true and matching exclude_remotes is nil' do
         let(:skip) { true }
-        let(:exclude_remote_names) { ['origin'] }
+        let(:exclude_remotes) { ['origin'] }
 
         it { subject.should == true }
       end
 
-      context 'skip is false and matching exclude_remote_names is nil' do
+      context 'skip is false and matching exclude_remotes is nil' do
         let(:skip) { false }
-        let(:exclude_remote_names) { ['origin'] }
+        let(:exclude_remotes) { ['origin'] }
       end
 
-      context 'skip is true and non-matching exclude_remote_names is nil' do
+      context 'skip is true and non-matching exclude_remotes is nil' do
         let(:skip) { true }
-        let(:exclude_remote_names) { ['heroku'] }
+        let(:exclude_remotes) { ['heroku'] }
 
         it { subject.should == true }
       end
 
-      context 'skip is false and non-matching exclude_remote_names is nil' do
+      context 'skip is false and non-matching exclude_remotes is nil' do
         let(:skip) { false }
-        let(:exclude_remote_names) { ['heroku'] }
+        let(:exclude_remotes) { ['heroku'] }
 
         it { subject.should == false }
       end

From 34c4398cedb025cf31e5f22a6a838325283ac03d Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 19:56:44 -0700
Subject: [PATCH 111/223] Rename exclude_branch_names to exclude_branches

This is more concise.
---
 README.md                         |  2 +-
 lib/overcommit/hook/base.rb       |  6 +++---
 spec/overcommit/hook/base_spec.rb | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 4edb82d2..8dbd38ac 100644
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ Option                                  | Description
 `requires_files`                        | If `true`, this hook runs only if files that are applicable to it have been modified. See `include` and `exclude` for how to specify applicable files.
 `include`                               | File paths or glob patterns of files that apply to this hook. The hook will only run on the applicable files when they have been modified. Note that the concept of modified varies for different types of hooks. By default, `include` matches every file until you specify a list of patterns.
 `exclude`                               | File paths or glob patterns of files that do not apply to this hook. This is used to exclude any files that would have been matched by `include`.
-`exclude_branch_patterns`               | List of branch names or glob patterns of branches that do not apply to this hook.
+`exclude_branches`                      | List of branch names or glob patterns of branches that this hook should not run against.
 `exclude_remotes`                       | *`PrePush` hooks only.* List of remote names that the hook should not run against.
 `problem_on_unmodified_line`            | How to treat errors reported on lines that weren't modified during the action captured by this hook (e.g. for pre-commit hooks, warnings/errors reported on lines that were not staged with `git add` may not be warnings/errors you care about). Valid values are `report`: report errors/warnings as-is regardless of line location (default); `warn`: report errors as warnings if they are on lines you didn't modify; and `ignore`: don't display errors/warnings at all if they are on lines you didn't modify (`ignore` is _not_ recommended).
 `on_fail`                               | Change the status of a failed hook to `warn` or `pass`. This allows you to treat failures as warnings or potentially ignore them entirely, but you should use caution when doing so as you might be hiding important information.
diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index bcdb02a8..4f48d770 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -80,7 +80,7 @@ def enabled?
     end
 
     def excluded?
-      exclude_branch_patterns.any? { |p| File.fnmatch(p, current_branch) }
+      exclude_branches.any? { |p| File.fnmatch(p, current_branch) }
     end
 
     def skip?
@@ -282,8 +282,8 @@ def transform_status(status)
       end
     end
 
-    def exclude_branch_patterns
-      @config['exclude_branch_patterns'] || []
+    def exclude_branches
+      @config['exclude_branches'] || []
     end
 
     def current_branch
diff --git a/spec/overcommit/hook/base_spec.rb b/spec/overcommit/hook/base_spec.rb
index 685c3590..8a0e5d46 100644
--- a/spec/overcommit/hook/base_spec.rb
+++ b/spec/overcommit/hook/base_spec.rb
@@ -81,13 +81,13 @@
       it { subject.should == true }
     end
 
-    context 'with exclude_branch_patterns specified' do
+    context 'with exclude_branches specified' do
       let(:current_branch) { 'test-branch' }
       let(:hook_config) do
         {
           'enabled' => true,
           'requires_files' => false,
-          'exclude_branch_patterns' => exclude_branch_patterns
+          'exclude_branches' => exclude_branches
         }
       end
 
@@ -97,26 +97,26 @@
           and_return(current_branch)
       end
 
-      context 'exclude_branch_patterns is nil' do
-        let(:exclude_branch_patterns) { nil }
+      context 'exclude_branches is nil' do
+        let(:exclude_branches) { nil }
 
         it { subject.should == true }
       end
 
-      context 'exact match between exclude_branch_patterns and current_branch' do
-        let(:exclude_branch_patterns) { ['test-branch'] }
+      context 'exact match between exclude_branches and current_branch' do
+        let(:exclude_branches) { ['test-branch'] }
 
         it { subject.should == false }
       end
 
-      context 'partial match between exclude_branch_patterns and current_branch' do
-        let(:exclude_branch_patterns) { ['test-*'] }
+      context 'partial match between exclude_branches and current_branch' do
+        let(:exclude_branches) { ['test-*'] }
 
         it { subject.should == false }
       end
 
-      context 'non-match between exclude_branch_patterns and current_branch' do
-        let(:exclude_branch_patterns) { ['no-test-*'] }
+      context 'non-match between exclude_branches and current_branch' do
+        let(:exclude_branches) { ['no-test-*'] }
 
         it { subject.should == true }
       end

From 9bcfcb5f2719e3b38ae155b495d00234192f55cd Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 20:33:38 -0700
Subject: [PATCH 112/223] Rename ignore_branch_deletions to
 include_branch_deletions

This emphasizes that the default is not to include remote branch
deletions, and uses language like "include" which is already used in
other option names.
---
 README.md                                  |   1 +
 lib/overcommit/hook/pre_push/base.rb       |  16 +--
 spec/overcommit/hook/pre_push/base_spec.rb | 144 ++++++---------------
 3 files changed, 48 insertions(+), 113 deletions(-)

diff --git a/README.md b/README.md
index 8dbd38ac..3133cb49 100644
--- a/README.md
+++ b/README.md
@@ -228,6 +228,7 @@ Option                                  | Description
 `exclude`                               | File paths or glob patterns of files that do not apply to this hook. This is used to exclude any files that would have been matched by `include`.
 `exclude_branches`                      | List of branch names or glob patterns of branches that this hook should not run against.
 `exclude_remotes`                       | *`PrePush` hooks only.* List of remote names that the hook should not run against.
+`include_branch_deletions`              | *`PrePush` hooks only.* By default, `PrePush` hooks will **not** run for pushes that delete a remote branch. Set to `true` to have the hook run even for deleted remote branches.
 `problem_on_unmodified_line`            | How to treat errors reported on lines that weren't modified during the action captured by this hook (e.g. for pre-commit hooks, warnings/errors reported on lines that were not staged with `git add` may not be warnings/errors you care about). Valid values are `report`: report errors/warnings as-is regardless of line location (default); `warn`: report errors as warnings if they are on lines you didn't modify; and `ignore`: don't display errors/warnings at all if they are on lines you didn't modify (`ignore` is _not_ recommended).
 `on_fail`                               | Change the status of a failed hook to `warn` or `pass`. This allows you to treat failures as warnings or potentially ignore them entirely, but you should use caution when doing so as you might be hiding important information.
 `on_warn`                               | Similar to `on_fail`, change the status of a hook that returns a warning status to either `pass` (you wish to silence warnings entirely) or `fail` (you wish to treat all warnings as errors).
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 32a8baf3..cb1e6c53 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -9,24 +9,20 @@ class Base < Overcommit::Hook::Base
 
     def_delegators :@context, :remote_name, :remote_url, :pushed_refs
 
-    def skip?
-      super ||
-        exclude_remotes.include?(remote_name) ||
-        skip_for_remote_branch_deletion?
+    def run?
+      super &&
+        !exclude_remotes.include?(remote_name) &&
+        (include_branch_deletions? || !@context.remote_branch_deletion?)
     end
 
     private
 
-    def skip_for_remote_branch_deletion?
-      ignore_branch_deletions? && @context.remote_branch_deletion?
-    end
-
     def exclude_remotes
       @config['exclude_remotes'] || []
     end
 
-    def ignore_branch_deletions?
-      @config['ignore_branch_deletions'] != false
+    def include_branch_deletions?
+      @config['include_branch_deletions']
     end
   end
 end
diff --git a/spec/overcommit/hook/pre_push/base_spec.rb b/spec/overcommit/hook/pre_push/base_spec.rb
index 8f4309ff..04bc3508 100644
--- a/spec/overcommit/hook/pre_push/base_spec.rb
+++ b/spec/overcommit/hook/pre_push/base_spec.rb
@@ -8,10 +8,9 @@
   let(:config) { double('config') }
   let(:context) { double('context') }
   let(:hook) { described_class.new(config, context) }
+
   describe '#run?' do
-    let(:hook_config) do
-      { 'skip' => skip }
-    end
+    let(:hook_config) { {} }
 
     before do
       allow(context).to receive(:remote_name).and_return(remote_name)
@@ -19,142 +18,81 @@
       allow(config).to receive(:for_hook).and_return(hook_config)
     end
 
-    subject { hook.skip? }
-
-    context 'skip is true' do
-      let(:skip) { true }
-
-      it { subject.should == true }
-    end
-
-    context 'skip is false' do
-      let(:skip) { false }
-
-      it { subject.should == false }
-    end
+    subject { hook.run? }
 
     context 'with exclude_remotes specified' do
       let(:hook_config) do
-        { 'skip' => skip, 'exclude_remotes' => exclude_remotes }
+        { 'exclude_remotes' => exclude_remotes }
       end
-      let(:exclude_remotes) { nil }
 
-      context 'skip is true and exclude_remotes is nil' do
-        let(:skip) { true }
+      context 'exclude_remotes is nil' do
         let(:exclude_remotes) { nil }
 
         it { subject.should == true }
       end
 
-      context 'skip is false and exclude_remotes is nil' do
-        let(:skip) { false }
-        let(:exclude_remotes) { nil }
-      end
+      context 'exclude_remotes includes the remote' do
+        let(:exclude_remotes) { [remote_name] }
 
-      context 'skip is true and matching exclude_remotes is nil' do
-        let(:skip) { true }
-        let(:exclude_remotes) { ['origin'] }
-
-        it { subject.should == true }
-      end
-
-      context 'skip is false and matching exclude_remotes is nil' do
-        let(:skip) { false }
-        let(:exclude_remotes) { ['origin'] }
+        it { subject.should == false }
       end
 
-      context 'skip is true and non-matching exclude_remotes is nil' do
-        let(:skip) { true }
+      context 'exclude_remotes does not include the remote' do
         let(:exclude_remotes) { ['heroku'] }
 
         it { subject.should == true }
       end
-
-      context 'skip is false and non-matching exclude_remotes is nil' do
-        let(:skip) { false }
-        let(:exclude_remotes) { ['heroku'] }
-
-        it { subject.should == false }
-      end
     end
 
-    context 'with ignore_branch_deletions specified' do
+    context 'with include_branch_deletions specified' do
       let(:hook_config) do
-        { 'skip' => skip, 'ignore_branch_deletions' => ignore_branch_deletions }
+        { 'include_branch_deletions' => include_branch_deletions }
       end
       let(:remote_branch_deletion?) { false }
-      let(:ignore_branch_deletions) { false }
-
-      context(<<~DESC) do
-        skip is true and
-        remote_branch_deletion? is false and
-        ignore_branch_deletions false' do
-      DESC
-        let(:skip) { true }
+      let(:include_branch_deletions) { false }
+
+      context 'when remote branch is not being deleted' do
         let(:remote_branch_deletion?) { false }
-        let(:ignore_branch_deletions) { nil }
 
-        it { subject.should == true }
-      end
+        context 'when include_branch_deletions is not specified' do
+          let(:include_branch_deletions) { nil }
 
-      context(<<~DESC) do
-        skip is false and
-        remote_branch_deletion? is false and
-        ignore_branch_deletions false' do
-      DESC
-        let(:skip) { false }
-        let(:remote_branch_deletion?) { false }
-        let(:ignore_branch_deletions) { false }
+          it { subject.should == true }
+        end
 
-        it { subject.should == false }
-      end
+        context 'when include_branch_deletions is false' do
+          let(:include_branch_deletions) { false }
 
-      context(<<~DESC) do
-        skip is false and
-        remote_branch_deletion? is true and
-        ignore_branch_deletions false' do
-      DESC
-        let(:skip) { false }
-        let(:remote_branch_deletion?) { true }
-        let(:ignore_branch_deletions) { false }
+          it { subject.should == true }
+        end
 
-        it { subject.should == false }
+        context 'when include_branch_deletions is true' do
+          let(:include_branch_deletions) { true }
+
+          it { subject.should == true }
+        end
       end
 
-      context(<<~DESC) do
-        skip is false and
-        remote_branch_deletion? is true and
-        ignore_branch_deletions true' do
-      DESC
-        let(:skip) { false }
+      context 'when remote branch is being deleted' do
         let(:remote_branch_deletion?) { true }
-        let(:ignore_branch_deletions) { true }
 
-        it { subject.should == true }
-      end
+        context 'when include_branch_deletions is not specified' do
+          let(:include_branch_deletions) { nil }
 
-      context(<<~DESC) do
-        skip is false and
-        remote_branch_deletion? is false and
-        ignore_branch_deletions true' do
-      DESC
-        let(:skip) { false }
-        let(:remote_branch_deletion?) { false }
-        let(:ignore_branch_deletions) { true }
+          it { subject.should == false }
+        end
 
-        it { subject.should == false }
-      end
+        context 'when include_branch_deletions is false' do
+          let(:include_branch_deletions) { false }
 
-      context(<<-DESC) do
-        skip is true and
-        remote_branch_deletion? is true and
-        ignore_branch_deletions true' do
-      DESC
-        let(:skip) { true }
-        let(:remote_branch_deletion?) { true }
-        let(:ignore_branch_deletions) { true }
+          it { subject.should == false }
+        end
 
-        it { subject.should == true }
+        context 'when include_branch_deletions is true' do
+          let(:include_branch_deletions) { true }
+
+          it { subject.should == true }
+        end
       end
     end
   end

From a2674274a3e2744c7605cb6c7deeb84fd4d0c6b0 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 20:38:19 -0700
Subject: [PATCH 113/223] Update change log

---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6454b341..0f10120e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,10 @@
 * Add `GolangciLint` pre-commit and pre-push hooks
 * Add `GoTest` pre-push hook
 * Add `GoFmt` pre-commit hook
-* Add `excluded_branch_patterns` hook option to disable hooks running on specific branches
+* Add `exclude_branches` hook option to disable hooks running on specific branches
+* Add `exclude_remotes` pre-push hook option to disable pre-push hooks running against specific remotes
+* Change default behavior of pre-push hooks to **not** run against deleted remote branches
+* Add `include_branch_deletions` pre-push hook option to allow running for a remote branch deletion
 
 ## 0.51.0
 

From dbab5f2dc7714a8cdb89492e816e218e5dbded8f Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 16 Oct 2019 20:50:36 -0700
Subject: [PATCH 114/223] Rename include_branch_deletions to
 include_remote_ref_deletions

Upon further reflection, this API is not about remote branches, but
remote refs. Change its name to reflect that.
---
 CHANGELOG.md                                  |  5 ++-
 README.md                                     |  2 +-
 lib/overcommit/hook/pre_push/base.rb          |  6 +--
 lib/overcommit/hook_context/pre_push.rb       | 12 +++---
 spec/overcommit/hook/pre_push/base_spec.rb    | 40 +++++++++----------
 spec/overcommit/hook_context/pre_push_spec.rb |  6 +--
 6 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f10120e..3d6bda60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,9 @@
 * Add `GoFmt` pre-commit hook
 * Add `exclude_branches` hook option to disable hooks running on specific branches
 * Add `exclude_remotes` pre-push hook option to disable pre-push hooks running against specific remotes
-* Change default behavior of pre-push hooks to **not** run against deleted remote branches
-* Add `include_branch_deletions` pre-push hook option to allow running for a remote branch deletion
+* Change default behavior of pre-push hooks to **not** run against deleted remote refs
+* Add `include_remote_ref_deletions` pre-push hook option to allow running for a remote branch deletion
+* Rename `remote_branch_deletion?` pre-push hook helper to `remote_ref_deletion?`
 
 ## 0.51.0
 
diff --git a/README.md b/README.md
index 3133cb49..a2b3d7fe 100644
--- a/README.md
+++ b/README.md
@@ -228,7 +228,7 @@ Option                                  | Description
 `exclude`                               | File paths or glob patterns of files that do not apply to this hook. This is used to exclude any files that would have been matched by `include`.
 `exclude_branches`                      | List of branch names or glob patterns of branches that this hook should not run against.
 `exclude_remotes`                       | *`PrePush` hooks only.* List of remote names that the hook should not run against.
-`include_branch_deletions`              | *`PrePush` hooks only.* By default, `PrePush` hooks will **not** run for pushes that delete a remote branch. Set to `true` to have the hook run even for deleted remote branches.
+`include_remote_ref_deletions`          | *`PrePush` hooks only.* By default, `PrePush` hooks will **not** run for pushes that delete a remote ref (i.e. branches or tags). Set to `true` to have the hook run even for deleted remote ref.
 `problem_on_unmodified_line`            | How to treat errors reported on lines that weren't modified during the action captured by this hook (e.g. for pre-commit hooks, warnings/errors reported on lines that were not staged with `git add` may not be warnings/errors you care about). Valid values are `report`: report errors/warnings as-is regardless of line location (default); `warn`: report errors as warnings if they are on lines you didn't modify; and `ignore`: don't display errors/warnings at all if they are on lines you didn't modify (`ignore` is _not_ recommended).
 `on_fail`                               | Change the status of a failed hook to `warn` or `pass`. This allows you to treat failures as warnings or potentially ignore them entirely, but you should use caution when doing so as you might be hiding important information.
 `on_warn`                               | Similar to `on_fail`, change the status of a hook that returns a warning status to either `pass` (you wish to silence warnings entirely) or `fail` (you wish to treat all warnings as errors).
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index cb1e6c53..72c89d0c 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -12,7 +12,7 @@ class Base < Overcommit::Hook::Base
     def run?
       super &&
         !exclude_remotes.include?(remote_name) &&
-        (include_branch_deletions? || !@context.remote_branch_deletion?)
+        (include_remote_ref_deletions? || !@context.remote_ref_deletion?)
     end
 
     private
@@ -21,8 +21,8 @@ def exclude_remotes
       @config['exclude_remotes'] || []
     end
 
-    def include_branch_deletions?
-      @config['include_branch_deletions']
+    def include_remote_ref_deletions?
+      @config['include_remote_ref_deletions']
     end
   end
 end
diff --git a/lib/overcommit/hook_context/pre_push.rb b/lib/overcommit/hook_context/pre_push.rb
index 363afb6d..1f37db43 100644
--- a/lib/overcommit/hook_context/pre_push.rb
+++ b/lib/overcommit/hook_context/pre_push.rb
@@ -13,13 +13,13 @@ def remote_url
       @args[1]
     end
 
-    def remote_branch_deletion?
-      return @remote_branch_deletion if defined? @remote_branch_deletion
+    def remote_ref_deletion?
+      return @remote_ref_deletion if defined?(@remote_ref_deletion)
 
-      @remote_branch_deletion ||= input_lines.
-                                  first.
-                                  split(' ').
-                                  first == '(deleted)'
+      @remote_ref_deletion ||= input_lines.
+                               first.
+                               split(' ').
+                               first == '(deleted)'
     end
 
     def pushed_refs
diff --git a/spec/overcommit/hook/pre_push/base_spec.rb b/spec/overcommit/hook/pre_push/base_spec.rb
index 04bc3508..3bfb7cb0 100644
--- a/spec/overcommit/hook/pre_push/base_spec.rb
+++ b/spec/overcommit/hook/pre_push/base_spec.rb
@@ -4,7 +4,7 @@
 
 describe Overcommit::Hook::PrePush::Base do
   let(:remote_name) { 'origin' }
-  let(:remote_branch_deletion?) { false }
+  let(:remote_ref_deletion?) { false }
   let(:config) { double('config') }
   let(:context) { double('context') }
   let(:hook) { described_class.new(config, context) }
@@ -14,7 +14,7 @@
 
     before do
       allow(context).to receive(:remote_name).and_return(remote_name)
-      allow(context).to receive(:remote_branch_deletion?).and_return(remote_branch_deletion?)
+      allow(context).to receive(:remote_ref_deletion?).and_return(remote_ref_deletion?)
       allow(config).to receive(:for_hook).and_return(hook_config)
     end
 
@@ -44,52 +44,52 @@
       end
     end
 
-    context 'with include_branch_deletions specified' do
+    context 'with include_remote_ref_deletions specified' do
       let(:hook_config) do
-        { 'include_branch_deletions' => include_branch_deletions }
+        { 'include_remote_ref_deletions' => include_remote_ref_deletions }
       end
-      let(:remote_branch_deletion?) { false }
-      let(:include_branch_deletions) { false }
+      let(:remote_ref_deletion?) { false }
+      let(:include_remote_ref_deletions) { false }
 
       context 'when remote branch is not being deleted' do
-        let(:remote_branch_deletion?) { false }
+        let(:remote_ref_deletion?) { false }
 
-        context 'when include_branch_deletions is not specified' do
-          let(:include_branch_deletions) { nil }
+        context 'when include_remote_ref_deletions is not specified' do
+          let(:include_remote_ref_deletions) { nil }
 
           it { subject.should == true }
         end
 
-        context 'when include_branch_deletions is false' do
-          let(:include_branch_deletions) { false }
+        context 'when include_remote_ref_deletions is false' do
+          let(:include_remote_ref_deletions) { false }
 
           it { subject.should == true }
         end
 
-        context 'when include_branch_deletions is true' do
-          let(:include_branch_deletions) { true }
+        context 'when include_remote_ref_deletions is true' do
+          let(:include_remote_ref_deletions) { true }
 
           it { subject.should == true }
         end
       end
 
       context 'when remote branch is being deleted' do
-        let(:remote_branch_deletion?) { true }
+        let(:remote_ref_deletion?) { true }
 
-        context 'when include_branch_deletions is not specified' do
-          let(:include_branch_deletions) { nil }
+        context 'when include_remote_ref_deletions is not specified' do
+          let(:include_remote_ref_deletions) { nil }
 
           it { subject.should == false }
         end
 
-        context 'when include_branch_deletions is false' do
-          let(:include_branch_deletions) { false }
+        context 'when include_remote_ref_deletions is false' do
+          let(:include_remote_ref_deletions) { false }
 
           it { subject.should == false }
         end
 
-        context 'when include_branch_deletions is true' do
-          let(:include_branch_deletions) { true }
+        context 'when include_remote_ref_deletions is true' do
+          let(:include_remote_ref_deletions) { true }
 
           it { subject.should == true }
         end
diff --git a/spec/overcommit/hook_context/pre_push_spec.rb b/spec/overcommit/hook_context/pre_push_spec.rb
index f8958059..8f0a07a2 100644
--- a/spec/overcommit/hook_context/pre_push_spec.rb
+++ b/spec/overcommit/hook_context/pre_push_spec.rb
@@ -23,8 +23,8 @@
     it { should == remote_url }
   end
 
-  describe '#remote_branch_deletion?' do
-    subject { context.remote_branch_deletion? }
+  describe '#remote_ref_deletion?' do
+    subject { context.remote_ref_deletion? }
 
     before do
       input.stub(:read).and_return("#{local_ref} #{local_sha1} #{remote_ref} #{remote_sha1}\n")
@@ -70,7 +70,7 @@
       input.stub(:read).and_return("#{local_ref} #{local_sha1} #{remote_ref} #{remote_sha1}\n")
     end
 
-    it 'should parse commit info from the input' do
+    it 'parses commit info from the input' do
       pushed_refs.length.should == 1
       pushed_refs.each do |pushed_ref|
         pushed_ref.local_ref.should == local_ref

From 0ee7aefb27b747d54c4626a6a8662a9da39fae7b Mon Sep 17 00:00:00 2001
From: Christian Bruckmayer <christian@bruckmayer.net>
Date: Wed, 16 Oct 2019 13:44:59 +0100
Subject: [PATCH 115/223] [PrePush::ProtectedBranches] Implement setting
 destructive_only setting per branch

---
 .../hook/pre_push/protected_branches.rb       | 55 ++++++++++++++-----
 spec/integration/protected_branches_spec.rb   |  2 +
 .../hook/pre_push/protected_branches_spec.rb  | 16 +++++-
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/lib/overcommit/hook/pre_push/protected_branches.rb b/lib/overcommit/hook/pre_push/protected_branches.rb
index fe943695..aca3f2ec 100644
--- a/lib/overcommit/hook/pre_push/protected_branches.rb
+++ b/lib/overcommit/hook/pre_push/protected_branches.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module Overcommit::Hook::PrePush
-  # Prevents destructive updates to specified branches.
+  # Prevents updates to specified branches.
+  # Accepts a 'destructive_only' option globally or per branch
+  # to only prevent destructive updates.
   class ProtectedBranches < Base
     def run
       return :pass unless illegal_pushes.any?
@@ -17,32 +19,55 @@ def run
 
     def illegal_pushes
       @illegal_pushes ||= pushed_refs.select do |pushed_ref|
-        protected?(pushed_ref.remote_ref) && allow_non_destructive?(pushed_ref)
+        protected?(pushed_ref)
       end
     end
 
-    def protected?(remote_ref)
+    def protected?(ref)
+      find_pattern(ref.remote_ref)&.destructive?(ref)
+    end
+
+    def find_pattern(remote_ref)
       ref_name = remote_ref[%r{refs/heads/(.*)}, 1]
-      return false if ref_name.nil?
-      protected_branch_patterns.any? do |pattern|
-        File.fnmatch(pattern, ref_name)
+      return if ref_name.nil?
+
+      patterns.find do |pattern|
+        File.fnmatch(pattern.to_s, ref_name)
       end
     end
 
-    def protected_branch_patterns
-      @protected_branch_patterns ||= Array(config['branches']).
-        concat(Array(config['branch_patterns']))
+    def patterns
+      @patterns ||= fetch_patterns
     end
 
-    def destructive_only?
+    def fetch_patterns
+      branch_configurations.map do |pattern|
+        if pattern.is_a?(Hash)
+          Pattern.new(pattern.keys.first, pattern['destructive_only'])
+        else
+          Pattern.new(pattern, global_destructive_only?)
+        end
+      end
+    end
+
+    def branch_configurations
+      config['branches'].to_a + config['branch_patterns'].to_a
+    end
+
+    def global_destructive_only?
       config['destructive_only'].nil? || config['destructive_only']
     end
 
-    def allow_non_destructive?(ref)
-      if destructive_only?
-        ref.destructive?
-      else
-        true
+    Pattern = Struct.new('Pattern', :name, :destructive_only) do
+      alias_method :to_s, :name
+      alias_method :destructive_only?, :destructive_only
+
+      def destructive?(ref)
+        if destructive_only?
+          ref.destructive?
+        else
+          true
+        end
       end
     end
   end
diff --git a/spec/integration/protected_branches_spec.rb b/spec/integration/protected_branches_spec.rb
index 8eade771..115be29d 100644
--- a/spec/integration/protected_branches_spec.rb
+++ b/spec/integration/protected_branches_spec.rb
@@ -24,6 +24,8 @@
         enabled: true
         branches:
           - protected
+          - protected_for_destructive_only:
+            destructive_only: true
   YML
 
   around do |example|
diff --git a/spec/overcommit/hook/pre_push/protected_branches_spec.rb b/spec/overcommit/hook/pre_push/protected_branches_spec.rb
index 92a27d07..0f8db55a 100644
--- a/spec/overcommit/hook/pre_push/protected_branches_spec.rb
+++ b/spec/overcommit/hook/pre_push/protected_branches_spec.rb
@@ -15,13 +15,15 @@
   let(:context) { double('context') }
   subject { described_class.new(config, context) }
 
-  let(:protected_branch_patterns) { ['master', 'release/*'] }
+  let(:branch_configurations) do
+    ['master', 'release/*', { 'destructive_only_branch' => nil, 'destructive_only' => true }]
+  end
   let(:pushed_ref) do
     instance_double(Overcommit::HookContext::PrePush::PushedRef)
   end
 
   before do
-    subject.stub(protected_branch_patterns: protected_branch_patterns)
+    subject.stub(branch_configurations: branch_configurations)
     pushed_ref.stub(:remote_ref).and_return("refs/heads/#{pushed_ref_name}")
     context.stub(:pushed_refs).and_return([pushed_ref])
   end
@@ -94,6 +96,16 @@
       let(:pushed_ref_name) { 'release/0.1.0' }
       include_examples 'protected branch'
     end
+
+    context 'when branch overwrites global destructive_only' do
+      before do
+        pushed_ref.stub(:destructive?).and_return(true)
+      end
+      let(:pushed_ref_name) { 'destructive_only_branch' }
+      let(:hook_config) { { 'destructive_only' => false } }
+
+      it { should fail_hook }
+    end
   end
 
   context 'when pushing tags' do

From dd9ba2adcc5988ffd27e922486773c304bf2cc08 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 17 Oct 2019 01:06:05 -0700
Subject: [PATCH 116/223] Update change log with ProtectedBranches update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d6bda60..a3b35a2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Change default behavior of pre-push hooks to **not** run against deleted remote refs
 * Add `include_remote_ref_deletions` pre-push hook option to allow running for a remote branch deletion
 * Rename `remote_branch_deletion?` pre-push hook helper to `remote_ref_deletion?`
+* Add per-branch `destructive_only` setting to `ProtectedBranches` pre-push hook
 
 ## 0.51.0
 

From d1648df3e1604578fdb3332896b9edbd993352c8 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 14 Dec 2019 18:59:02 -0800
Subject: [PATCH 117/223] Update README with clarification about ad hoc hooks

A question in #696 suggests we need to add additional clarification.
---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index a2b3d7fe..f1076df6 100644
--- a/README.md
+++ b/README.md
@@ -661,6 +661,12 @@ executes the command and appends any arguments and standard input stream that
 would have been passed to the regular hook. The hook passes or fails based
 on the exit status of the command.
 
+The script is executed as if Git were calling the hook directly. If you want
+to understand which arguments are passed to the script depending on the type
+of hook, see the [git-hooks documentation][GHD].
+
+[GHD]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
+
 ## Security
 
 While Overcommit can make managing Git hooks easier and more convenient,

From b4635a3b212b3cbd482f7263fe47c7303a7d684d Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 14 Dec 2019 19:21:41 -0800
Subject: [PATCH 118/223] Cut version 0.52.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3b35a2a..2ed9a5ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.52.0
 
 * Fix `Mdl` to properly parse JSON output from `mdl`
 * Add `GolangciLint` pre-commit and pre-push hooks
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 24650e15..ebcbd99d 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.51.0'
+  VERSION = '0.52.0'
 end

From 7b80b0c914e78f75fdceba63886ed446606d2666 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 3 Jan 2020 17:37:30 -0800
Subject: [PATCH 119/223] Gracefully handle case where no standard input is
 provided

Fixes #700.
---
 CHANGELOG.md                                  |  4 ++++
 lib/overcommit/hook_context/pre_push.rb       |  4 ++--
 spec/overcommit/hook_context/pre_push_spec.rb | 10 +++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ed9a5ac..16498f95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix case where no standard input is provided to `pre-push` hooks
+
 ## 0.52.0
 
 * Fix `Mdl` to properly parse JSON output from `mdl`
diff --git a/lib/overcommit/hook_context/pre_push.rb b/lib/overcommit/hook_context/pre_push.rb
index 1f37db43..0b2e72a1 100644
--- a/lib/overcommit/hook_context/pre_push.rb
+++ b/lib/overcommit/hook_context/pre_push.rb
@@ -17,8 +17,8 @@ def remote_ref_deletion?
       return @remote_ref_deletion if defined?(@remote_ref_deletion)
 
       @remote_ref_deletion ||= input_lines.
-                               first.
-                               split(' ').
+                               first&.
+                               split(' ')&.
                                first == '(deleted)'
     end
 
diff --git a/spec/overcommit/hook_context/pre_push_spec.rb b/spec/overcommit/hook_context/pre_push_spec.rb
index 8f0a07a2..101e0f1a 100644
--- a/spec/overcommit/hook_context/pre_push_spec.rb
+++ b/spec/overcommit/hook_context/pre_push_spec.rb
@@ -26,8 +26,10 @@
   describe '#remote_ref_deletion?' do
     subject { context.remote_ref_deletion? }
 
+    let(:standard_input) { "#{local_ref} #{local_sha1} #{remote_ref} #{remote_sha1}\n" }
+
     before do
-      input.stub(:read).and_return("#{local_ref} #{local_sha1} #{remote_ref} #{remote_sha1}\n")
+      input.stub(:read).and_return(standard_input)
     end
 
     context 'when pushing new branch to remote ref' do
@@ -56,6 +58,12 @@
 
       it { should == true }
     end
+
+    context 'when no standard input is provided' do
+      let(:standard_input) { '' }
+
+      it { should == false }
+    end
   end
 
   describe '#pushed_refs' do

From 97e8610a5069875ebe3e3005f3555e03b849a9e9 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 3 Jan 2020 17:47:27 -0800
Subject: [PATCH 120/223] Cut version 0.52.1

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16498f95..5c586f60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.52.1
 
 * Fix case where no standard input is provided to `pre-push` hooks
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index ebcbd99d..f6c31248 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.52.0'
+  VERSION = '0.52.1'
 end

From dc50788d3c6e710231e1efa6bfba9a16e334fae5 Mon Sep 17 00:00:00 2001
From: Timo Webler <timo.webler@dkd.de>
Date: Fri, 31 Jan 2020 10:26:48 +0100
Subject: [PATCH 121/223] Increase performance of PhpCs pre commit hook

---
 lib/overcommit/hook/pre_commit/php_cs.rb | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/php_cs.rb b/lib/overcommit/hook/pre_commit/php_cs.rb
index 6204c8dd..8e837406 100644
--- a/lib/overcommit/hook/pre_commit/php_cs.rb
+++ b/lib/overcommit/hook/pre_commit/php_cs.rb
@@ -12,21 +12,14 @@ class PhpCs < Base
     def run
       messages = []
 
-      applicable_files.each do |file|
-        result = execute(command, args: [file])
-        if result.status
-          rows = result.stdout.split("\n")
-
-          # Discard the csv header
-          rows.shift
-
-          # Push each of the errors in the particular file into the array
-          rows.map do |row|
-            messages << row
-          end
-        end
+      result = execute(command, args: applicable_files)
+      if result.status
+        messages = result.stdout.split("\n")
+        # Discard the csv header
+        messages.shift
       end
 
+      return :fail if messages.empty? && !result.success?
       return :pass if messages.empty?
 
       parse_messages(messages)

From 16eded31008dcb050d36534c970f3c28994afb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Povilas=20Jur=C4=8Dys?=
 <povilasjurcys@users.noreply.github.com>
Date: Sun, 8 Mar 2020 06:01:35 +0200
Subject: [PATCH 122/223] Add pronto to pre_push hooks (#706)

---
 .gitignore                                   |  2 +
 README.md                                    |  1 +
 config/default.yml                           |  7 +++
 lib/overcommit/hook/pre_commit/pronto.rb     | 17 ++-----
 lib/overcommit/hook/pre_push/base.rb         |  5 ++
 lib/overcommit/hook/pre_push/pronto.rb       | 12 +++++
 lib/overcommit/hook/shared/pronto.rb         | 21 ++++++++
 spec/overcommit/hook/pre_push/pronto_spec.rb | 53 ++++++++++++++++++++
 8 files changed, 104 insertions(+), 14 deletions(-)
 create mode 100644 lib/overcommit/hook/pre_push/pronto.rb
 create mode 100644 lib/overcommit/hook/shared/pronto.rb
 create mode 100644 spec/overcommit/hook/pre_push/pronto_spec.rb

diff --git a/.gitignore b/.gitignore
index 2bb7f841..7ea8f1f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ coverage/
 pkg/
 .bundle
 .idea
+.history/
+.vscode/
diff --git a/README.md b/README.md
index f1076df6..7f996177 100644
--- a/README.md
+++ b/README.md
@@ -582,6 +582,7 @@ aborted.
 * [Brakeman](lib/overcommit/hook/pre_push/brakeman.rb)
 * [Minitest](lib/overcommit/hook/pre_push/minitest.rb)
 * [PhpUnit](lib/overcommit/hook/pre_push/php_unit.rb)
+* [Pronto](lib/overcommit/hook/pre_push/pronto.rb)
 * [ProtectedBranches](lib/overcommit/hook/pre_push/protected_branches.rb)
 * [Pytest](lib/overcommit/hook/pre_push/pytest.rb)
 * [PythonNose](lib/overcommit/hook/pre_push/python_nose.rb)
diff --git a/config/default.yml b/config/default.yml
index 5a6887f4..74503e8e 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1297,6 +1297,13 @@ PrePush:
     flags: ['--bootstrap', 'vendor/autoload.php', 'tests']
     install_command: 'composer require --dev phpunit/phpunit'
 
+  Pronto:
+    enabled: false
+    description: 'Analyzing with pronto'
+    required_executable: 'pronto'
+    install_command: 'gem install pronto'
+    flags: ['run', '--exit-code']
+
   ProtectedBranches:
     enabled: false
     description: 'Check for illegal pushes to protected branches'
diff --git a/lib/overcommit/hook/pre_commit/pronto.rb b/lib/overcommit/hook/pre_commit/pronto.rb
index da016e8f..664b4ef8 100644
--- a/lib/overcommit/hook/pre_commit/pronto.rb
+++ b/lib/overcommit/hook/pre_commit/pronto.rb
@@ -1,23 +1,12 @@
 # frozen_string_literal: true
 
+require 'overcommit/hook/shared/pronto'
+
 module Overcommit::Hook::PreCommit
   # Runs `pronto`
   #
   # @see https://github.com/mmozuras/pronto
   class Pronto < Base
-    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
-      type.include?('E') ? :error : :warning
-    end
-
-    def run
-      result = execute(command)
-      return :pass if result.success?
-
-      extract_messages(
-        result.stdout.split("\n"),
-        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
-        MESSAGE_TYPE_CATEGORIZER,
-      )
-    end
+    include Overcommit::Hook::Shared::Pronto
   end
 end
diff --git a/lib/overcommit/hook/pre_push/base.rb b/lib/overcommit/hook/pre_push/base.rb
index 72c89d0c..35e2b3a8 100644
--- a/lib/overcommit/hook/pre_push/base.rb
+++ b/lib/overcommit/hook/pre_push/base.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require 'overcommit/utils/messages_utils'
 
 module Overcommit::Hook::PrePush
   # Functionality common to all pre-push hooks.
@@ -17,6 +18,10 @@ def run?
 
     private
 
+    def extract_messages(*args)
+      Overcommit::Utils::MessagesUtils.extract_messages(*args)
+    end
+
     def exclude_remotes
       @config['exclude_remotes'] || []
     end
diff --git a/lib/overcommit/hook/pre_push/pronto.rb b/lib/overcommit/hook/pre_push/pronto.rb
new file mode 100644
index 00000000..93a0724e
--- /dev/null
+++ b/lib/overcommit/hook/pre_push/pronto.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'overcommit/hook/shared/pronto'
+
+module Overcommit::Hook::PrePush
+  # Runs `pronto`
+  #
+  # @see https://github.com/mmozuras/pronto
+  class Pronto < Base
+    include Overcommit::Hook::Shared::Pronto
+  end
+end
diff --git a/lib/overcommit/hook/shared/pronto.rb b/lib/overcommit/hook/shared/pronto.rb
new file mode 100644
index 00000000..b1d71442
--- /dev/null
+++ b/lib/overcommit/hook/shared/pronto.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::Shared
+  # Shared code used by all Pronto hooks. Runs pronto linter.
+  module Pronto
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.include?('E') ? :error : :warning
+    end
+
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
+        MESSAGE_TYPE_CATEGORIZER,
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/pronto_spec.rb b/spec/overcommit/hook/pre_push/pronto_spec.rb
new file mode 100644
index 00000000..2851a860
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/pronto_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::Pronto do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.rb file2.rb])
+  end
+
+  context 'when pronto exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when pronto exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return([
+          'file2.rb:10 E: IDENTICAL code found in :iter.',
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
+
+    context 'and it reports a warning' do
+      before do
+        result.stub(:stdout).and_return([
+          'file1.rb:12 W: Line is too long. [107/80]',
+          'file2.rb:14 I: Prefer single-quoted strings'
+        ].join("\n"))
+      end
+
+      it { should warn }
+    end
+  end
+end

From d9e499874ace66203d063207c7f6f9d8dc543796 Mon Sep 17 00:00:00 2001
From: Cole Mackenzie <colemackenzie1@gmail.com>
Date: Tue, 10 Mar 2020 21:18:51 -0700
Subject: [PATCH 123/223] Removing extra newline in replacement string (#709)

Co-authored-by: Cole Mackenzie <cole_mackenzie@intuit.com>
---
 lib/overcommit/hook/prepare_commit_msg/replace_branch.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index ce490163..c64f4c22 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -17,7 +17,7 @@ def run
       Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
 
       modify_commit_message do |old_contents|
-        "#{new_template}\n#{old_contents}"
+        "#{new_template} #{old_contents}"
       end
 
       :pass

From a15edd2df9f3c3626112a84f92c5cf8a6b39d3d3 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 5 Apr 2020 18:05:25 -0700
Subject: [PATCH 124/223] Add note about checking stash if hook interrupted

Closes #711
---
 lib/overcommit/printer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/overcommit/printer.rb b/lib/overcommit/printer.rb
index aebb8326..02d0995d 100644
--- a/lib/overcommit/printer.rb
+++ b/lib/overcommit/printer.rb
@@ -51,6 +51,7 @@ def interrupt_triggered
     def run_interrupted
       log.newline
       log.warning '⚠  Hook run interrupted by user'
+      log.warning '⚠  If files appear modified/missing, check your stash to recover them'
       log.newline
     end
 

From 9a4028ec3470a634418f45e4a056e61f7f5ccb01 Mon Sep 17 00:00:00 2001
From: Kevin Deisz <kevin.deisz+github@gmail.com>
Date: Fri, 24 Apr 2020 01:30:07 -0400
Subject: [PATCH 125/223] Add skip_if hook option (#715)

Skip hook with `skip_if` configuration if defined.
---
 README.md                         |  1 +
 lib/overcommit/hook/base.rb       |  3 +-
 spec/overcommit/hook/base_spec.rb | 65 +++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7f996177..af718032 100644
--- a/README.md
+++ b/README.md
@@ -241,6 +241,7 @@ Option                                  | Description
 `processors`                            | The number of processing units to reserve for this hook. This does not reserve CPUs, but indicates that out of the total number of possible concurrent hooks allowed by the global `concurrency` option, this hook requires the specified number. Thus in the typical case where `concurrency` is set to the number of available cores (default), and you have a hook that executes an application which itself creates 2 threads (or is otherwise scheduled on 2 cores), you can indicate that Overcommit should allocate 2 `processors` to the hook. Ideally this means your hooks won't put undue load on your available cores.
 `install_command`                       | Command the user can run to install the `required_executable` (or alternately the specified `required_libraries`). This is intended for documentation purposes, as Overcommit does not install software on your behalf since there are too many edge cases where such behavior would result in incorrectly configured installations (e.g. installing a Python package in the global package space instead of in a virtual environment).
 `skip_file_checkout`                    | Whether to skip this hook for file checkouts (e.g. `git checkout some-ref -- file`). Only applicable to `PostCheckout` hooks.
+`skip_if`                               | Array of arguments to be executed to determine whether or not the hook should run. For example, setting this to a value of `['bash', '-c', '! which my-executable']` would allow you to skip running this hook if `my-executable` was not in the bin path.
 
 In addition to the built-in configuration options, each hook can expose its
 own unique configuration options. The `AuthorEmail` hook, for example, allows
diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index 4f48d770..37696d08 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -84,7 +84,8 @@ def excluded?
     end
 
     def skip?
-      @config['skip']
+      @config['skip'] ||
+        (@config['skip_if'] ? execute(@config['skip_if']).success? : false)
     end
 
     def run?
diff --git a/spec/overcommit/hook/base_spec.rb b/spec/overcommit/hook/base_spec.rb
index 8a0e5d46..0c8c7af7 100644
--- a/spec/overcommit/hook/base_spec.rb
+++ b/spec/overcommit/hook/base_spec.rb
@@ -122,4 +122,69 @@
       end
     end
   end
+
+  context '#skip?' do
+    before do
+      config.stub(:for_hook).and_return(hook_config)
+    end
+
+    subject { hook.skip? }
+
+    context 'with skip_if not specified' do
+      let(:hook_config) do
+        { 'skip' => skip }
+      end
+
+      context 'with skip true' do
+        let(:skip) { true }
+
+        it { subject.should == true }
+      end
+
+      context 'with skip false' do
+        let(:skip) { false }
+
+        it { subject.should == false }
+      end
+    end
+
+    context 'with skip_if specified' do
+      before do
+        result = Overcommit::Subprocess::Result.new(success ? 0 : 1, '', '')
+        allow(Overcommit::Utils).to receive(:execute).and_return(result)
+      end
+
+      let(:hook_config) do
+        { 'skip' => skip, 'skip_if' => ['bash', '-c', '! which my-executable'] }
+      end
+
+      context 'with skip true and skip_if returning true' do
+        let(:skip) { true }
+        let(:success) { true }
+
+        it { subject.should == true }
+      end
+
+      context 'with skip true and skip_if returning false' do
+        let(:skip) { true }
+        let(:success) { false }
+
+        it { subject.should == true }
+      end
+
+      context 'with skip false and skip_if returning true' do
+        let(:skip) { false }
+        let(:success) { true }
+
+        it { subject.should == true }
+      end
+
+      context 'with skip false and skip_if returning false' do
+        let(:skip) { false }
+        let(:success) { false }
+
+        it { subject.should == false }
+      end
+    end
+  end
 end

From a409887771182f9e1411d53b806fff025fe61851 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 23 Apr 2020 22:34:57 -0700
Subject: [PATCH 126/223] Cut version 0.53.0

---
 CHANGELOG.md              | 8 ++++++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c586f60..1711cb54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Overcommit Changelog
 
+## 0.53.0
+
+* Improve performance in `PhpCs` pre-commit hook
+* Add `Pronto` pre-push hook
+* Remove erroneous extra newline in replacement string for `ReplaceBranch` prepare-commit-msg hook
+* Add note about potentially checking your stash when hook is interrupted
+* Add support for skipping hooks based on command result using the `skip_if` option
+
 ## 0.52.1
 
 * Fix case where no standard input is provided to `pre-push` hooks
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index f6c31248..d4659a8b 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.52.1'
+  VERSION = '0.53.0'
 end

From 0b8a6a6f313cebccc07ffac4bad2460647bc6ccf Mon Sep 17 00:00:00 2001
From: Igor Rzegocki <ajgon@users.noreply.github.com>
Date: Mon, 15 Jun 2020 03:30:16 +0200
Subject: [PATCH 127/223] Fix `YamlLint` hook. (#719)

Previously, when yamllint was failing, the exit code of the tool was
reflecting that. However, recently yamllint introduced `--strict`
parameter to do that. Without, it always returns success no matter if
lints were successful or failed. Which caused false-positives in
ovecommit, which was thinking that everything is okay.

This fix adds `--strict` to `yamllint` invocation, to bring back proper
behavior, and force hook to fail, when the tool fails.
---
 CHANGELOG.md                                      | 4 ++++
 config/default.yml                                | 2 +-
 spec/overcommit/hook/pre_commit/yaml_lint_spec.rb | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1711cb54..9978dd90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master
+
+* Fix `YamlLint` pre-commit hook
+
 ## 0.53.0
 
 * Improve performance in `PhpCs` pre-commit hook
diff --git a/config/default.yml b/config/default.yml
index 74503e8e..b31e1f06 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -885,7 +885,7 @@ PreCommit:
     enabled: false
     description: 'Analyze with YAMLlint'
     required_executable: 'yamllint'
-    flags: ['--format=parsable']
+    flags: ['--format=parsable', '--strict']
     install_command: 'pip install yamllint'
     include:
       - '**/*.yaml'
diff --git a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
index 72ebc6e8..cb08f4e1 100644
--- a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
@@ -19,7 +19,7 @@
   end
 
   before do
-    subject.stub(:execute).with(%w[yamllint --format=parsable], args: applicable_files).
+    subject.stub(:execute).with(%w[yamllint --format=parsable --strict], args: applicable_files).
       and_return(result)
   end
 

From 5e3aa0026b47092302bbfcd880a81415354d9443 Mon Sep 17 00:00:00 2001
From: "Jesse B. Hannah" <jesse@jbhannah.net>
Date: Wed, 24 Jun 2020 22:25:21 -0700
Subject: [PATCH 128/223] Relax childprocess requirement to allow 4.x (#721)

---
 overcommit.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overcommit.gemspec b/overcommit.gemspec
index 4e06bfc8..75704056 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency          'childprocess', '>= 0.6.3', '< 4'
+  s.add_dependency          'childprocess', '>= 0.6.3', '< 5'
   s.add_dependency          'iniparse', '~> 1.4'
 end

From 01859d11eaec3640cf963f4d835c2d9ebab1d56a Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 24 Jun 2020 22:27:01 -0700
Subject: [PATCH 129/223] Update change log

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9978dd90..0bcaeffb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Overcommit Changelog
 
-## master
+## master (unreleased)
 
 * Fix `YamlLint` pre-commit hook
+* Relax `childprocess` gem version constraint to allow version 4.x
 
 ## 0.53.0
 

From e48dcea9b1567ec0da50f3a90dd0a645eb4a5889 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 24 Jun 2020 22:27:28 -0700
Subject: [PATCH 130/223] Cut version 0.54.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bcaeffb..1fb9e87d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.54.0
 
 * Fix `YamlLint` pre-commit hook
 * Relax `childprocess` gem version constraint to allow version 4.x
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index d4659a8b..e934e404 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.53.0'
+  VERSION = '0.54.0'
 end

From 523b70c6c41e078e68a6f612cf7f10b01831b19a Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 11 Jul 2020 18:37:00 -0700
Subject: [PATCH 131/223] Create base Error class for all Overcommit errors

Makes it easier to define a catch-all `rescue` block for any
Overcommit-related error.
---
 lib/overcommit/exceptions.rb | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/overcommit/exceptions.rb b/lib/overcommit/exceptions.rb
index 3246c567..050982fb 100644
--- a/lib/overcommit/exceptions.rb
+++ b/lib/overcommit/exceptions.rb
@@ -1,52 +1,55 @@
 # frozen_string_literal: true
 
 module Overcommit::Exceptions
+  # Base error class.
+  class Error < StandardError; end
+
   # Raised when a {Configuration} could not be loaded from a file.
-  class ConfigurationError < StandardError; end
+  class ConfigurationError < Error; end
 
   # Raised when the Overcommit configuration file signature has changed.
-  class ConfigurationSignatureChanged < StandardError; end
+  class ConfigurationSignatureChanged < Error; end
 
   # Raised when trying to read/write to/from the local repo git config fails.
-  class GitConfigError < StandardError; end
+  class GitConfigError < Error; end
 
   # Raised when there was a problem reading submodule information for a repo.
-  class GitSubmoduleError < StandardError; end
+  class GitSubmoduleError < Error; end
 
   # Raised when there was a problem reading git revision information with `rev-list`.
-  class GitRevListError < StandardError; end
+  class GitRevListError < Error; end
 
   # Raised when a {HookContext} is unable to setup the environment before a run.
-  class HookSetupFailed < StandardError; end
+  class HookSetupFailed < Error; end
 
   # Raised when a {HookContext} is unable to clean the environment after a run.
-  class HookCleanupFailed < StandardError; end
+  class HookCleanupFailed < Error; end
 
   # Raised when a hook run was cancelled by the user.
-  class HookCancelled < StandardError; end
+  class HookCancelled < Error; end
 
   # Raised when a hook could not be loaded by a {HookRunner}.
-  class HookLoadError < StandardError; end
+  class HookLoadError < Error; end
 
   # Raised when a {HookRunner} could not be loaded.
-  class HookContextLoadError < StandardError; end
+  class HookContextLoadError < Error; end
 
   # Raised when a pipe character is used in the `execute` helper, as this was
   # likely used in error.
-  class InvalidCommandArgs < StandardError; end
+  class InvalidCommandArgs < Error; end
 
   # Raised when an installation target is not a valid git repository.
-  class InvalidGitRepo < StandardError; end
+  class InvalidGitRepo < Error; end
 
   # Raised when a hook was defined incorrectly.
-  class InvalidHookDefinition < StandardError; end
+  class InvalidHookDefinition < Error; end
 
   # Raised when one or more hook plugin signatures have changed.
-  class InvalidHookSignature < StandardError; end
+  class InvalidHookSignature < Error; end
 
   # Raised when there is a problem processing output into {Hook::Messages}s.
-  class MessageProcessingError < StandardError; end
+  class MessageProcessingError < Error; end
 
   # Raised when an installation target already contains non-Overcommit hooks.
-  class PreExistingHooks < StandardError; end
+  class PreExistingHooks < Error; end
 end

From 938343217e631ca78bc4e25d58c40f70f3b438f4 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 11 Jul 2020 18:47:29 -0700
Subject: [PATCH 132/223] Gracefully handle large file lists in list_files
 helper

Previously, if the list of files was larger than the allowed number of
arguments for the OS, this would fail. Use our `execute` helper to
automatically handle argument splitting.
---
 lib/overcommit/git_repo.rb       | 19 ++++++++++---------
 spec/overcommit/git_repo_spec.rb | 14 ++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/overcommit/git_repo.rb b/lib/overcommit/git_repo.rb
index bd659eb7..179aebaa 100644
--- a/lib/overcommit/git_repo.rb
+++ b/lib/overcommit/git_repo.rb
@@ -109,15 +109,16 @@ def modified_files(options)
     # @return [Array<String>] list of absolute file paths
     def list_files(paths = [], options = {})
       ref = options[:ref] || 'HEAD'
-      path_list =
-        if OS.windows?
-          paths = paths.map { |path| path.gsub('"', '""') }
-          paths.empty? ? '' : "\"#{paths.join('" "')}\""
-        else
-          paths.shelljoin
-        end
-      `git ls-tree --name-only #{ref} #{path_list}`.
-        split(/\n/).
+
+      result = Overcommit::Utils.execute(%W[git ls-tree --name-only #{ref}], args: paths)
+      unless result.success?
+        raise Overcommit::Exceptions::Error,
+              "Error listing files. EXIT STATUS(es): #{result.statuses}.\n" \
+              "STDOUT(s): #{result.stdouts}.\n" \
+              "STDERR(s): #{result.stderrs}."
+      end
+
+      result.stdout.split(/\n/).
         map { |relative_file| File.expand_path(relative_file) }.
         reject { |file| File.directory?(file) } # Exclude submodule directories
     end
diff --git a/spec/overcommit/git_repo_spec.rb b/spec/overcommit/git_repo_spec.rb
index b5376212..a5f753e1 100644
--- a/spec/overcommit/git_repo_spec.rb
+++ b/spec/overcommit/git_repo_spec.rb
@@ -217,6 +217,20 @@
         end
       end
     end
+
+    context 'when the git ls-tree command fails for whatever reason' do
+      before do
+        result = double('result', success?: false, statuses: [1], stdouts: '', stderrs: '')
+        allow(Overcommit::Utils).
+          to receive(:execute).
+          with(%w[git ls-tree --name-only HEAD], args: []).
+          and_return(result)
+      end
+
+      it 'raises' do
+        expect { subject }.to raise_error Overcommit::Exceptions::Error
+      end
+    end
   end
 
   describe '.tracked?' do

From 8fc0f912717e54a864ddeb42fe0adf59345ce8e8 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 11 Jul 2020 21:36:35 -0700
Subject: [PATCH 133/223] Fix warnings from displaying in gemfile option tests

Recent versions of RubyGems now display warnings like:

    WARNING:  licenses is empty, but is recommended.  Use a license
              identifier from http://spdx.org/licenses or 'Nonstandard'
              for a nonstandard license.
    WARNING:  no homepage specified
    WARNING:  See http://guides.rubygems.org/specification-reference/
              for help

Fix by adding dummy values.
---
 spec/integration/gemfile_option_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/integration/gemfile_option_spec.rb b/spec/integration/gemfile_option_spec.rb
index 9cf25877..00019c48 100644
--- a/spec/integration/gemfile_option_spec.rb
+++ b/spec/integration/gemfile_option_spec.rb
@@ -21,6 +21,8 @@
       s.name = 'my_fake_gem'
       s.version = '1.0.0'
       s.author = 'John Doe'
+      s.license = 'MIT'
+      s.homepage = 'https://example.com'
       s.email = 'john.doe@example.com'
       s.summary = 'A fake gem'
       s.files = [File.join('lib', 'my_fake_gem.rb')]

From 05ab6814ab819e7b33eae6073c437264b60acf21 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 11 Jul 2020 21:39:28 -0700
Subject: [PATCH 134/223] Update change log with list_files fix

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fb9e87d..241a9a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix `Overcommit::GitRepo.list_files` helper to work with arbitrarily large lists of files.
+
 ## 0.54.0
 
 * Fix `YamlLint` pre-commit hook

From 0387c46d020c233ed50194002041dbcfbd2c61a9 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 11 Jul 2020 21:45:29 -0700
Subject: [PATCH 135/223] README updates

Minor updates to the README. Removed the broken GIF link, which I am
unable to find.
---
 README.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index af718032..345c0aa1 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,6 @@
 `overcommit` is a tool to manage and configure
 [Git hooks](http://git-scm.com/book/en/Customizing-Git-Git-Hooks).
 
-![Demonstration](https://sds.github.io/overcommit/overcommit.gif)
-
 In addition to supporting a wide variety of hooks that can be used across
 multiple repositories, you can also define hooks specific to a repository which
 are stored in source control. You can also easily
@@ -63,8 +61,8 @@ significantly increases the install time for non-Windows platforms.
 
 ### Dependencies
 
-Some of the hooks have third-party dependencies. For example, to lint your
-[SCSS](http://sass-lang.com/) files, you're going to need our
+Some hooks have third-party dependencies. For example, to lint your
+[SCSS](http://sass-lang.com/) files, you're going to need the
 [scss_lint gem](https://github.com/sds/scss-lint).
 
 Depending on the hooks you enable/disable for your repository, you'll need to
@@ -79,9 +77,9 @@ available during your hook runs.
 
 `overcommit` is installed via [RubyGems](https://rubygems.org/). It is strongly
 recommended that your environment support running `gem install` without
-requiring `sudo` privileges. Using a Ruby version manager like
-[`rbenv`](https://github.com/rbenv/rbenv/) or [`rvm`](https://rvm.io/) can help
-here.
+requiring root user privileges via `sudo` or otherwise. Using a Ruby version
+manager like [`rbenv`](https://github.com/rbenv/rbenv/) or
+[`rvm`](https://rvm.io/) is recommended.
 
 Once you have an environment that allows you to install gems without `sudo`,
 run:

From 6aa78d7459aff2d62b6604c7aac9705a177e7132 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 11 Jul 2020 21:58:01 -0700
Subject: [PATCH 136/223] Skip flakey tests on AppVeyor build

These tests fail for mysterious reasons. They aren't high signal, so
skip them if we are running in an AppVeyor build.
---
 spec/integration/resolving_cherry_pick_conflict_spec.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/integration/resolving_cherry_pick_conflict_spec.rb b/spec/integration/resolving_cherry_pick_conflict_spec.rb
index 2ea05d7b..58e22e65 100644
--- a/spec/integration/resolving_cherry_pick_conflict_spec.rb
+++ b/spec/integration/resolving_cherry_pick_conflict_spec.rb
@@ -39,15 +39,18 @@
   end
 
   it 'exits with a non-zero status' do
+    skip 'Skipping flakey test on AppVeyor Windows builds' if ENV['APPVEYOR']
     subject.status.should_not == 0
   end
 
   it 'does not remove the CHERRY_PICK_HEAD file' do
+    skip 'Skipping flakey test on AppVeyor Windows builds' if ENV['APPVEYOR']
     subject
     Dir['.git/*'].should include '.git/CHERRY_PICK_HEAD'
   end
 
   it 'keeps the commit message from the cherry-picked commit' do
+    skip 'Skipping flakey test on AppVeyor Windows builds' if ENV['APPVEYOR']
     subject
     File.read(File.join('.git', 'MERGE_MSG')).should include 'Add Branch 2 addition'
   end

From 2a7e266d1db853cf204b7f0ff7144d677f7b8297 Mon Sep 17 00:00:00 2001
From: Drew Rothstein <drew.rothstein@gmail.com>
Date: Mon, 13 Jul 2020 20:51:12 -0700
Subject: [PATCH 137/223] [authorname] allow for non-0 (#723)

---
 CHANGELOG.md                                        |  1 +
 lib/overcommit/hook/pre_commit/author_name.rb       |  4 ++--
 spec/integration/committing_spec.rb                 | 12 +++++++++++-
 spec/overcommit/hook/pre_commit/author_name_spec.rb |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 241a9a6a..e0c46556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## master (unreleased)
 
 * Fix `Overcommit::GitRepo.list_files` helper to work with arbitrarily large lists of files.
+* `AuthorName` allows for non-0 length to be more inclusive of names.
 
 ## 0.54.0
 
diff --git a/lib/overcommit/hook/pre_commit/author_name.rb b/lib/overcommit/hook/pre_commit/author_name.rb
index 63d4243a..fc89792a 100644
--- a/lib/overcommit/hook/pre_commit/author_name.rb
+++ b/lib/overcommit/hook/pre_commit/author_name.rb
@@ -12,9 +12,9 @@ def run
           result.stdout.chomp
         end
 
-      unless name.split(' ').count >= 2
+      if name.empty?
         return :fail,
-               "Author must have at least first and last name, but was: #{name}.\n" \
+               "Author name must be non-0 in length.\n" \
                'Set your name with `git config --global user.name "Your Name"` ' \
                'or via the GIT_AUTHOR_NAME environment variable'
       end
diff --git a/spec/integration/committing_spec.rb b/spec/integration/committing_spec.rb
index 6bdd0f08..1e1f65a6 100644
--- a/spec/integration/committing_spec.rb
+++ b/spec/integration/committing_spec.rb
@@ -26,7 +26,7 @@
 
   context 'when a hook fails' do
     before do
-      `git config --local user.name "John"`
+      `git config --local user.name ""`
     end
 
     it 'exits with a non-zero status' do
@@ -34,6 +34,16 @@
     end
   end
 
+  context 'when no hooks fail on single author name' do
+    before do
+      `git config --local user.name "John"`
+    end
+
+    it 'exits successfully' do
+      subject.status.should == 0
+    end
+  end
+
   context 'when no hooks fail' do
     before do
       `git config --local user.name "John Doe"`
diff --git a/spec/overcommit/hook/pre_commit/author_name_spec.rb b/spec/overcommit/hook/pre_commit/author_name_spec.rb
index 7cf230d5..1ed0502f 100644
--- a/spec/overcommit/hook/pre_commit/author_name_spec.rb
+++ b/spec/overcommit/hook/pre_commit/author_name_spec.rb
@@ -18,7 +18,7 @@
     context 'when user has only a first name' do
       let(:name) { 'John' }
 
-      it { should fail_hook }
+      it { should pass }
     end
 
     context 'when user has first and last name' do

From bbac977c287a580ea96f94e33c4c15139dfc8949 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 13 Jul 2020 20:54:28 -0700
Subject: [PATCH 138/223] Cut version 0.54.1

---
 CHANGELOG.md              | 4 ++--
 lib/overcommit/version.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0c46556..5ff68a5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,9 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.54.1
 
 * Fix `Overcommit::GitRepo.list_files` helper to work with arbitrarily large lists of files.
-* `AuthorName` allows for non-0 length to be more inclusive of names.
+* Fix `AuthorName` to allow mononyms to be more inclusive of names.
 
 ## 0.54.0
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index e934e404..61e4ceef 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.54.0'
+  VERSION = '0.54.1'
 end

From b70cefcc992b109ca9905b4653a7cf2751f56fff Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 14 Jul 2020 18:20:37 -0700
Subject: [PATCH 139/223] Disable GoFmt pre-commit hook by default

This should never have been enabled by default. All Overcommit hooks
except the bare essentials should be opt-in, to minimize surprises.
---
 config/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index b31e1f06..55fa74f6 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -338,7 +338,7 @@ PreCommit:
     keywords: ['FContext','FDescribe','FIt','FMeasure','FSpecify','FWhen']
 
   GoFmt:
-    enabled: true
+    enabled: false
     description: 'Fix with go fmt'
     required_executable: 'go'
     command: ['go', 'fmt']

From 7afda8e5f56b6f09aea6f633bd5d5c841bc738ae Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 14 Jul 2020 18:23:22 -0700
Subject: [PATCH 140/223] Update change log with GoFmt pre-commit fix

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ff68a5b..20a25c63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Fix `GoFmt` to not be enabled by default. This was enabled by mistake when introduced in Overcommit `0.52.0`.
+
 ## 0.54.1
 
 * Fix `Overcommit::GitRepo.list_files` helper to work with arbitrarily large lists of files.

From 0491737438665563b888d6e6b0f262ba4a29eae1 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 14 Jul 2020 18:48:13 -0700
Subject: [PATCH 141/223] Cut version 0.55.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20a25c63..54dfd994 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.55.0
 
 * Fix `GoFmt` to not be enabled by default. This was enabled by mistake when introduced in Overcommit `0.52.0`.
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 61e4ceef..d9528301 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.54.1'
+  VERSION = '0.55.0'
 end

From 603aa1bd17f12611a99b36cb818dfdf352f6db70 Mon Sep 17 00:00:00 2001
From: jethrodaniel <jethrodaniel@gmail.com>
Date: Wed, 12 Aug 2020 23:56:41 -0500
Subject: [PATCH 142/223] Update ReplaceBranch hook to avoid running on
 `--amend` by default (#725)

* change default branch pattern for ReplaceBranch

This changes the default branch pattern to a simpler pattern.

This is added to make understanding the hook and it's usage a bit
easier.

* change an example in ReplaceBranch spec to default

This changes the spec to test against the same default branch
replacement pattern specified in the default config.

This is just to make things more consistent.

* improve class comment describing ReplaceBranch usage

This makes the usage of this (hopefully) obvious to anyone reading it.

* add `commit` to default ReplaceBranch skipped types

This makes the default behavior of this hook skip commits that explicitly
give the SHA, i.e, `--amend`, `-c`, or `-C`.

This is added because most people (I'd argue) don't want to run this
hook on `amend`s.

* remove extra hard-coded space in ReplaceBranch

This removes a trailing space after the repacement text, as well as
`#strip`ing the replacement text.

* refactor ReplaceBranch specs to avoid so much mocking

This changes the specs for the ReplaceBranch hook to

- test the contents of the file that `git` writes it's commit message to
- explicitly set config variables instead of mocking them

* update ReplaceBranch specs to test all `skipped_commit_types`

* shorten a long line for the linter
---
 config/default.yml                            |   9 +-
 .../hook/prepare_commit_msg/replace_branch.rb |  42 +++++-
 .../prepare_commit_msg/replace_branch_spec.rb | 136 ++++++++++++------
 3 files changed, 138 insertions(+), 49 deletions(-)

diff --git a/config/default.yml b/config/default.yml
index 55fa74f6..27794ffe 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1237,9 +1237,14 @@ PrepareCommitMsg:
   ReplaceBranch:
     enabled: false
     description: 'Prepends the commit message with text based on the branch name'
-    branch_pattern: '\A.*\w+[-_](\d+).*\z'
+    branch_pattern: '\A(\d+)-(\w+).*\z'
     replacement_text: '[#\1]'
-    skipped_commit_types: ['message', 'template', 'merge', 'squash']
+    skipped_commit_types:
+     - 'message'  # if message is given via `-m`, `-F`
+     - 'template' # if `-t` is given or `commit.template` is set
+     - 'commit'   # if `-c`, `-C`, or `--amend` is given
+     - 'merge'    # if merging
+     - 'squash'   # if squashing
     on_fail: warn
 
 # Hooks that run during `git push`, after remote refs have been updated but
diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index c64f4c22..5739d124 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -2,11 +2,37 @@
 
 module Overcommit::Hook::PrepareCommitMsg
   # Prepends the commit message with a message based on the branch name.
+  #
+  # === What to prepend
+  #
   # It's possible to reference parts of the branch name through the captures in
   # the `branch_pattern` regex.
+  #
+  # For instance, if your current branch is `123-topic` then this config
+  #
+  #    branch_pattern: '(\d+)-(\w+)'
+  #    replacement_text: '[#\1]'
+  #
+  # would make this hook prepend commit messages with `[#123]`.
+  #
+  # Similarly, a replacement text of `[\1][\2]` would result in `[123][topic]`.
+  #
+  # == When to run this hook
+  #
+  # You can configure this to run only for specific types of commits by setting
+  # the `skipped_commit_types`. The allowed types are
+  #
+  # - 'message'  - if message is given via `-m`, `-F`
+  # - 'template' - if `-t` is given or `commit.template` is set
+  # - 'commit'   - if `-c`, `-C`, or `--amend` is given
+  # - 'merge'    - if merging
+  # - 'squash'   - if squashing
+  #
   class ReplaceBranch < Base
+    DEFAULT_BRANCH_PATTERN = /\A(\d+)-(\w+).*\z/
+
     def run
-      return :pass if skipped_commit_types.include? commit_message_source
+      return :pass if skip?
 
       Overcommit::Utils.log.debug(
         "Checking if '#{Overcommit::GitRepo.current_branch}' matches #{branch_pattern}"
@@ -17,21 +43,25 @@ def run
       Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
 
       modify_commit_message do |old_contents|
-        "#{new_template} #{old_contents}"
+        "#{new_template}#{old_contents}"
       end
 
       :pass
     end
 
     def new_template
-      @new_template ||= Overcommit::GitRepo.current_branch.gsub(branch_pattern, replacement_text)
+      @new_template ||=
+        begin
+          curr_branch = Overcommit::GitRepo.current_branch
+          curr_branch.gsub(branch_pattern, replacement_text).strip
+        end
     end
 
     def branch_pattern
       @branch_pattern ||=
         begin
           pattern = config['branch_pattern']
-          Regexp.new((pattern || '').empty? ? '\A.*\w+[-_](\d+).*\z' : pattern)
+          Regexp.new((pattern || '').empty? ? DEFAULT_BRANCH_PATTERN : pattern)
         end
     end
 
@@ -53,5 +83,9 @@ def replacement_text_config
     def skipped_commit_types
       @skipped_commit_types ||= config['skipped_commit_types'].map(&:to_sym)
     end
+
+    def skip?
+      skipped_commit_types.include?(commit_message_source)
+    end
   end
 end
diff --git a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
index 71eb7c13..3844f77a 100644
--- a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
@@ -4,77 +4,127 @@
 require 'overcommit/hook_context/prepare_commit_msg'
 
 describe Overcommit::Hook::PrepareCommitMsg::ReplaceBranch do
-  let(:config) { Overcommit::ConfigurationLoader.default_configuration }
-  let(:context) do
-    Overcommit::HookContext::PrepareCommitMsg.new(
-      config, [prepare_commit_message_file, 'commit'], StringIO.new
+  def checkout_branch(branch)
+    allow(Overcommit::GitRepo).to receive(:current_branch).and_return(branch)
+  end
+
+  def new_config(opts = {})
+    default = Overcommit::ConfigurationLoader.default_configuration
+
+    return default if opts.empty?
+
+    default.merge(
+      Overcommit::Configuration.new(
+        'PrepareCommitMsg' => {
+          'ReplaceBranch' => opts.merge('enabled' => true)
+        }
+      )
     )
   end
 
-  let(:prepare_commit_message_file) { 'prepare_commit_message_file.txt' }
+  def new_context(config, argv)
+    Overcommit::HookContext::PrepareCommitMsg.new(config, argv, StringIO.new)
+  end
 
-  subject(:hook) { described_class.new(config, context) }
+  def hook_for(config, context)
+    described_class.new(config, context)
+  end
 
-  before do
-    File.open(prepare_commit_message_file, 'w')
-    allow(Overcommit::Utils).to receive_message_chain(:log, :debug)
-    allow(Overcommit::GitRepo).to receive(:current_branch).and_return(new_head)
+  def add_file(name, contents)
+    File.open(name, 'w') { |f| f.puts contents }
   end
 
-  after do
-    File.delete(prepare_commit_message_file) unless ENV['APPVEYOR']
+  def remove_file(name)
+    File.delete(name)
   end
 
-  let(:new_head) { 'userbeforeid-12345-branch-description' }
+  before { allow(Overcommit::Utils).to receive_message_chain(:log, :debug) }
+
+  let(:config)           { new_config }
+  let(:normal_context)   { new_context(config, ['COMMIT_EDITMSG']) }
+  let(:message_context)  { new_context(config, %w[COMMIT_EDITMSG message]) }
+  let(:commit_context)   { new_context(config, %w[COMMIT_EDITMSG commit HEAD]) }
+  let(:merge_context)    { new_context(config, %w[MERGE_MSG merge]) }
+  let(:squash_context)   { new_context(config, %w[SQUASH_MSG squash]) }
+  let(:template_context) { new_context(config, ['template.txt', 'template']) }
+  subject(:hook)         { hook_for(config, normal_context) }
 
   describe '#run' do
+    before { add_file    'COMMIT_EDITMSG', '' }
+    after  { remove_file 'COMMIT_EDITMSG' }
+
     context 'when the checked out branch matches the pattern' do
+      before { checkout_branch '123-topic' }
+      before { hook.run }
+
       it { is_expected.to pass }
 
-      context 'template contents' do
-        subject(:template) { hook.new_template }
+      it 'prepends the replacement text' do
+        expect(File.read('COMMIT_EDITMSG')).to eq("[#123]\n")
+      end
+    end
 
-        before do
-          hook.stub(:replacement_text).and_return('Id is: \1')
-        end
+    context "when the checked out branch doesn't matches the pattern" do
+      before { checkout_branch 'topic-123' }
+      before { hook.run }
 
-        it { is_expected.to eq('Id is: 12345') }
+      context 'with the default `skipped_commit_types`' do
+        it { is_expected.to warn }
       end
-    end
 
-    context 'when the checked out branch does not match the pattern' do
-      let(:new_head) { "this shouldn't match the default pattern" }
+      context 'when merging, and `skipped_commit_types` includes `merge`' do
+        let(:config)   { new_config('skipped_commit_types' => ['merge']) }
+        subject(:hook) { hook_for(config, merge_context) }
 
-      context 'when the commit type is in `skipped_commit_types`' do
-        let(:context) do
-          Overcommit::HookContext::PrepareCommitMsg.new(
-            config, [prepare_commit_message_file, 'template'], StringIO.new
-          )
-        end
+        it { is_expected.to pass }
+      end
+
+      context 'when merging, and `skipped_commit_types` includes `template`' do
+        let(:config)   { new_config('skipped_commit_types' => ['template']) }
+        subject(:hook) { hook_for(config, template_context) }
 
         it { is_expected.to pass }
       end
 
-      context 'when the commit type is not in `skipped_commit_types`' do
-        it { is_expected.to warn }
+      context 'when merging, and `skipped_commit_types` includes `message`' do
+        let(:config)   { new_config('skipped_commit_types' => ['message']) }
+        subject(:hook) { hook_for(config, message_context) }
+
+        it { is_expected.to pass }
       end
-    end
-  end
 
-  describe '#replacement_text' do
-    subject(:replacement_text) { hook.replacement_text }
-    let(:replacement_template_file) { 'valid_filename.txt' }
-    let(:replacement) { 'Id is: \1' }
+      context 'when merging, and `skipped_commit_types` includes `commit`' do
+        let(:config)   { new_config('skipped_commit_types' => ['commit']) }
+        subject(:hook) { hook_for(config, commit_context) }
 
-    context 'when the replacement text points to a valid filename' do
-      before do
-        hook.stub(:replacement_text_config).and_return(replacement_template_file)
-        File.stub(:exist?).and_return(true)
-        File.stub(:read).with(replacement_template_file).and_return(replacement)
+        it { is_expected.to pass }
+      end
+
+      context 'when merging, and `skipped_commit_types` includes `squash`' do
+        let(:config)   { new_config('skipped_commit_types' => ['squash']) }
+        subject(:hook) { hook_for(config, squash_context) }
+
+        it { is_expected.to pass }
       end
+    end
+
+    context 'when the replacement text points to a valid filename' do
+      before { checkout_branch '123-topic' }
+      before { add_file    'replacement_text.txt', 'FOO' }
+      after  { remove_file 'replacement_text.txt' }
+
+      let(:config) { new_config('replacement_text' => 'replacement_text.txt') }
+      let(:normal_context) { new_context(config, ['COMMIT_EDITMSG']) }
+      subject(:hook)       { hook_for(config, normal_context) }
+
+      before { hook.run }
+
+      it { is_expected.to pass }
+
+      let(:commit_msg) { File.read('COMMIT_EDITMSG') }
 
-      describe 'it reads it as the replacement template' do
-        it { is_expected.to eq(replacement) }
+      it 'uses the file contents as the replacement text' do
+        expect(commit_msg).to eq(File.read('replacement_text.txt'))
       end
     end
   end

From 1c8b1797af876520e376279fb88399eb0f55e9b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zaj=C4=85c?= <michal.zajac+github@gmail.com>
Date: Tue, 22 Sep 2020 06:44:18 +0200
Subject: [PATCH 143/223]  `modified_files` and `modified_lines_in_file` on
 CommitMsg  (#727)

* Install debugger

* Extract stashing before running hooks to a module

This way, if another hook context needs this behavior it can be included
using Overcommit::HookContext::Helpers::StashUnstashedChanges.

* Extract getting file modifications into a module

Methods for determining which files were modified and on which lines can
be imported into hook context with
Overcommit::HookContext::Helpers::FileModifications.

* Refactor hook contexts to use new modules

* Apply Rubocop fixes

* Remove pry and pry-byebug from Gemfile
---
 lib/overcommit/hook_context/commit_msg.rb     |   7 +
 .../helpers/file_modifications.rb             |  78 ++
 .../helpers/stash_unstaged_changes.rb         | 141 ++++
 lib/overcommit/hook_context/pre_commit.rb     | 204 +-----
 .../hook_context/commit_msg_spec.rb           | 665 ++++++++++++++++++
 5 files changed, 896 insertions(+), 199 deletions(-)
 create mode 100644 lib/overcommit/hook_context/helpers/file_modifications.rb
 create mode 100644 lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb

diff --git a/lib/overcommit/hook_context/commit_msg.rb b/lib/overcommit/hook_context/commit_msg.rb
index e73aa3ff..ae32e55d 100644
--- a/lib/overcommit/hook_context/commit_msg.rb
+++ b/lib/overcommit/hook_context/commit_msg.rb
@@ -1,8 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'pre_commit'
+require_relative 'helpers/stash_unstaged_changes'
+require_relative 'helpers/file_modifications'
+
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by commit-msg hooks.
   class CommitMsg < Base
+    include Overcommit::HookContext::Helpers::StashUnstagedChanges
+    include Overcommit::HookContext::Helpers::FileModifications
+
     def empty_message?
       commit_message.strip.empty?
     end
diff --git a/lib/overcommit/hook_context/helpers/file_modifications.rb b/lib/overcommit/hook_context/helpers/file_modifications.rb
new file mode 100644
index 00000000..9eade907
--- /dev/null
+++ b/lib/overcommit/hook_context/helpers/file_modifications.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Overcommit::HookContext
+  module Helpers
+    # This module contains methods for determining what files were changed and on what unique line
+    # numbers did the change occur.
+    module FileModifications
+      # Returns whether this hook run was triggered by `git commit --amend`
+      def amendment?
+        return @amendment unless @amendment.nil?
+
+        cmd = Overcommit::Utils.parent_command
+        return unless cmd
+        amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
+
+        # Since the ps command can return invalid byte sequences for commands
+        # containing unicode characters, we replace the offending characters,
+        # since the pattern we're looking for will consist of ASCII characters
+        unless cmd.valid_encoding?
+          cmd = Overcommit::Utils.
+            parent_command.
+            encode('UTF-16be', invalid: :replace, replace: '?').
+            encode('UTF-8')
+        end
+
+        return @amendment if
+          # True if the command is a commit with the --amend flag
+          @amendment = !(/\s#{amend_pattern}/ =~ cmd).nil?
+
+        # Check for git aliases that call `commit --amend`
+        `git config --get-regexp "^alias\\." "#{amend_pattern}"`.
+          scan(/alias\.([-\w]+)/). # Extract the alias
+          each do |match|
+            return @amendment if
+              # True if the command uses a git alias for `commit --amend`
+              @amendment = !(/git(\.exe)?\s+#{match[0]}/ =~ cmd).nil?
+          end
+
+        @amendment
+      end
+
+      # Get a list of added, copied, or modified files that have been staged.
+      # Renames and deletions are ignored, since there should be nothing to check.
+      def modified_files
+        unless @modified_files
+          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'
+            previously_modified = Overcommit::GitRepo.modified_files(subcmd: subcmd)
+            @modified_files |= filter_modified_files(previously_modified)
+          end
+        end
+        @modified_files
+      end
+
+      # Returns the set of line numbers corresponding to the lines that were
+      # changed in a specified file.
+      def modified_lines_in_file(file)
+        @modified_lines ||= {}
+        unless @modified_lines[file]
+          @modified_lines[file] =
+            Overcommit::GitRepo.extract_modified_lines(file, staged: true)
+
+          # Include lines modified in last commit if amending
+          if amendment?
+            subcmd = 'show --format=%n'
+            @modified_lines[file] +=
+              Overcommit::GitRepo.extract_modified_lines(file, subcmd: subcmd)
+          end
+        end
+        @modified_lines[file]
+      end
+    end
+  end
+end
diff --git a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
new file mode 100644
index 00000000..e015453a
--- /dev/null
+++ b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+module Overcommit::HookContext
+  module Helpers
+    # This module contains behavior for stashing unstaged changes before hooks are ran and restoring
+    # them afterwards
+    module StashUnstagedChanges
+      # Stash unstaged contents of files so hooks don't see changes that aren't
+      # about to be committed.
+      def setup_environment
+        store_modified_times
+        Overcommit::GitRepo.store_merge_state
+        Overcommit::GitRepo.store_cherry_pick_state
+
+        # 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
+
+          # While running hooks make it appear as if nothing changed
+          restore_modified_times
+        end
+      end
+
+      # Restore unstaged changes and reset file modification times so it appears
+      # as if nothing ever changed.
+      #
+      # We want to restore the modification times for each of the files after
+      # every step to ensure as little time as possible has passed while the
+      # modification time on the file was newer. This helps us play more nicely
+      # with file watchers.
+      def cleanup_environment
+        if @changes_stashed
+          clear_working_tree
+          restore_working_tree
+          restore_modified_times
+        end
+
+        Overcommit::GitRepo.restore_merge_state
+        Overcommit::GitRepo.restore_cherry_pick_state
+      end
+
+      private
+
+      # Stores the modification times for all modified files to make it appear like
+      # they never changed.
+      #
+      # This prevents (some) editors from complaining about files changing when we
+      # stash changes before running the hooks.
+      def store_modified_times
+        @modified_times = {}
+
+        staged_files = modified_files
+        unstaged_files = Overcommit::GitRepo.modified_files(staged: false)
+
+        (staged_files + unstaged_files).each do |file|
+          next if Overcommit::Utils.broken_symlink?(file)
+          next unless File.exist?(file) # Ignore renamed files (old file no longer exists)
+          @modified_times[file] = File.mtime(file)
+        end
+      end
+
+      # Returns whether the current git branch is empty (has no commits).
+      def initial_commit?
+        return @initial_commit unless @initial_commit.nil?
+        @initial_commit = Overcommit::GitRepo.initial_commit?
+      end
+
+      # 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
+
+      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
+
+      # Restores the file modification times for all modified files to make it
+      # appear like they never changed.
+      def restore_modified_times
+        @modified_times.each do |file, time|
+          next if Overcommit::Utils.broken_symlink?(file)
+          next unless File.exist?(file)
+          File.utime(time, time, file)
+        end
+      end
+
+      # Clears the working tree so that the stash can be applied.
+      def clear_working_tree
+        removed_submodules = Overcommit::GitRepo.staged_submodule_removals
+
+        result = Overcommit::Utils.execute(%w[git reset --hard])
+        unless result.success?
+          raise Overcommit::Exceptions::HookCleanupFailed,
+                "Unable to cleanup working tree after #{hook_script_name} hooks run:" \
+                "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
+        end
+
+        # Hard-resetting a staged submodule removal results in the index being
+        # reset but the submodule being restored as an empty directory. This empty
+        # directory prevents us from stashing on a subsequent run if a hook fails.
+        #
+        # Work around this by removing these empty submodule directories as there
+        # doesn't appear any reason to keep them around.
+        removed_submodules.each do |submodule|
+          FileUtils.rmdir(submodule.path)
+        end
+      end
+
+      # Applies the stash to the working tree to restore the user's state.
+      def restore_working_tree
+        result = Overcommit::Utils.execute(%w[git stash pop --index --quiet])
+        unless result.success?
+          raise Overcommit::Exceptions::HookCleanupFailed,
+                "Unable to restore working tree after #{hook_script_name} hooks run:" \
+                "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/overcommit/hook_context/pre_commit.rb b/lib/overcommit/hook_context/pre_commit.rb
index 6c73cb3b..cd510605 100644
--- a/lib/overcommit/hook_context/pre_commit.rb
+++ b/lib/overcommit/hook_context/pre_commit.rb
@@ -2,6 +2,8 @@
 
 require 'fileutils'
 require 'set'
+require_relative 'helpers/stash_unstaged_changes'
+require_relative 'helpers/file_modifications'
 
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by pre-commit hooks.
@@ -9,204 +11,8 @@ module Overcommit::HookContext
   # This includes staged files, which lines of those files have been modified,
   # etc. It is also responsible for saving/restoring the state of the repo so
   # hooks only inspect staged changes.
-  class PreCommit < Base # rubocop:disable ClassLength
-    # Returns whether this hook run was triggered by `git commit --amend`
-    def amendment?
-      return @amendment unless @amendment.nil?
-
-      cmd = Overcommit::Utils.parent_command
-      return unless cmd
-      amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
-
-      # Since the ps command can return invalid byte sequences for commands
-      # containing unicode characters, we replace the offending characters,
-      # since the pattern we're looking for will consist of ASCII characters
-      unless cmd.valid_encoding?
-        cmd = Overcommit::Utils.parent_command.encode('UTF-16be', invalid: :replace, replace: '?').
-                                               encode('UTF-8')
-      end
-
-      return @amendment if
-        # True if the command is a commit with the --amend flag
-        @amendment = !(/\s#{amend_pattern}/ =~ cmd).nil?
-
-      # Check for git aliases that call `commit --amend`
-      `git config --get-regexp "^alias\\." "#{amend_pattern}"`.
-        scan(/alias\.([-\w]+)/). # Extract the alias
-        each do |match|
-          return @amendment if
-            # True if the command uses a git alias for `commit --amend`
-            @amendment = !(/git(\.exe)?\s+#{match[0]}/ =~ cmd).nil?
-        end
-
-      @amendment
-    end
-
-    # Stash unstaged contents of files so hooks don't see changes that aren't
-    # about to be committed.
-    def setup_environment
-      store_modified_times
-      Overcommit::GitRepo.store_merge_state
-      Overcommit::GitRepo.store_cherry_pick_state
-
-      # 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
-
-        # While running hooks make it appear as if nothing changed
-        restore_modified_times
-      end
-    end
-
-    # Restore unstaged changes and reset file modification times so it appears
-    # as if nothing ever changed.
-    #
-    # We want to restore the modification times for each of the files after
-    # every step to ensure as little time as possible has passed while the
-    # modification time on the file was newer. This helps us play more nicely
-    # with file watchers.
-    def cleanup_environment
-      if @changes_stashed
-        clear_working_tree
-        restore_working_tree
-        restore_modified_times
-      end
-
-      Overcommit::GitRepo.restore_merge_state
-      Overcommit::GitRepo.restore_cherry_pick_state
-    end
-
-    # Get a list of added, copied, or modified files that have been staged.
-    # Renames and deletions are ignored, since there should be nothing to check.
-    def modified_files
-      unless @modified_files
-        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'
-          previously_modified = Overcommit::GitRepo.modified_files(subcmd: subcmd)
-          @modified_files |= filter_modified_files(previously_modified)
-        end
-      end
-      @modified_files
-    end
-
-    # Returns the set of line numbers corresponding to the lines that were
-    # changed in a specified file.
-    def modified_lines_in_file(file)
-      @modified_lines ||= {}
-      unless @modified_lines[file]
-        @modified_lines[file] =
-          Overcommit::GitRepo.extract_modified_lines(file, staged: true)
-
-        # Include lines modified in last commit if amending
-        if amendment?
-          subcmd = 'show --format=%n'
-          @modified_lines[file] +=
-            Overcommit::GitRepo.extract_modified_lines(file, subcmd: subcmd)
-        end
-      end
-      @modified_lines[file]
-    end
-
-    # Returns whether the current git branch is empty (has no commits).
-    def initial_commit?
-      return @initial_commit unless @initial_commit.nil?
-      @initial_commit = Overcommit::GitRepo.initial_commit?
-    end
-
-    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
-
-      result = Overcommit::Utils.execute(%w[git reset --hard])
-      unless result.success?
-        raise Overcommit::Exceptions::HookCleanupFailed,
-              "Unable to cleanup working tree after #{hook_script_name} hooks run:" \
-              "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
-      end
-
-      # Hard-resetting a staged submodule removal results in the index being
-      # reset but the submodule being restored as an empty directory. This empty
-      # directory prevents us from stashing on a subsequent run if a hook fails.
-      #
-      # Work around this by removing these empty submodule directories as there
-      # doesn't appear any reason to keep them around.
-      removed_submodules.each do |submodule|
-        FileUtils.rmdir(submodule.path)
-      end
-    end
-
-    # Applies the stash to the working tree to restore the user's state.
-    def restore_working_tree
-      result = Overcommit::Utils.execute(%w[git stash pop --index --quiet])
-      unless result.success?
-        raise Overcommit::Exceptions::HookCleanupFailed,
-              "Unable to restore working tree after #{hook_script_name} hooks run:" \
-              "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
-      end
-    end
-
-    # 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
-    # they never changed.
-    #
-    # This prevents (some) editors from complaining about files changing when we
-    # stash changes before running the hooks.
-    def store_modified_times
-      @modified_times = {}
-
-      staged_files = modified_files
-      unstaged_files = Overcommit::GitRepo.modified_files(staged: false)
-
-      (staged_files + unstaged_files).each do |file|
-        next if Overcommit::Utils.broken_symlink?(file)
-        next unless File.exist?(file) # Ignore renamed files (old file no longer exists)
-        @modified_times[file] = File.mtime(file)
-      end
-    end
-
-    # Restores the file modification times for all modified files to make it
-    # appear like they never changed.
-    def restore_modified_times
-      @modified_times.each do |file, time|
-        next if Overcommit::Utils.broken_symlink?(file)
-        next unless File.exist?(file)
-        File.utime(time, time, file)
-      end
-    end
+  class PreCommit < Base
+    include Overcommit::HookContext::Helpers::StashUnstagedChanges
+    include Overcommit::HookContext::Helpers::FileModifications
   end
 end
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb
index 2078f463..2aa68516 100644
--- a/spec/overcommit/hook_context/commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/commit_msg_spec.rb
@@ -99,4 +99,669 @@
       subject.should end_with "git commit --edit --file=#{commit_message_file}"
     end
   end
+
+  describe '#amendment?' do
+    subject { context.amendment? }
+
+    before do
+      Overcommit::Utils.stub(:parent_command).and_return(command)
+    end
+
+    context 'when amending a commit using `git commit --amend`' do
+      let(:command) { 'git commit --amend' }
+
+      it { should == true }
+    end
+
+    context 'when the parent command contains invalid byte sequence' do
+      let(:command) { "git commit --amend -m \xE3M^AM^B" }
+
+      it { should == true }
+    end
+
+    context 'when amending a commit using a git alias' do
+      around do |example|
+        repo do
+          `git config alias.amend "commit --amend"`
+          `git config alias.other-amend "commit --amend"`
+          example.run
+        end
+      end
+
+      context 'when using one of multiple aliases' do
+        let(:command) { 'git amend' }
+
+        it { should == true }
+      end
+
+      context 'when using another of multiple aliases' do
+        let(:command) { 'git other-amend' }
+
+        it { should == true }
+      end
+    end
+
+    context 'when not amending a commit' do
+      context 'using `git commit`' do
+        let(:command) { 'git commit' }
+
+        it { should == false }
+      end
+
+      context 'using a git alias containing "--amend"' do
+        let(:command) { 'git no--amend' }
+
+        around do |example|
+          repo do
+            `git config alias.no--amend commit`
+            example.run
+          end
+        end
+
+        it { should == false }
+      end
+    end
+  end
+
+  describe '#setup_environment' do
+    subject { context.setup_environment }
+
+    context 'when there are no staged changes' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          echo('Hello Other World', 'other-tracked-file')
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
+          echo('Hello Again', 'untracked-file')
+          echo('Some more text', 'other-tracked-file', append: true)
+          example.run
+        end
+      end
+
+      it 'keeps already-committed files' do
+        subject
+        File.open('tracked-file', 'r').read.should == "Hello World\n"
+      end
+
+      it 'does not keep unstaged changes' do
+        subject
+        File.open('other-tracked-file', 'r').read.should == "Hello Other World\n"
+      end
+
+      it 'keeps untracked files' do
+        subject
+        File.open('untracked-file', 'r').read.should == "Hello Again\n"
+      end
+
+      it 'keeps modification times the same' do
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
+      end
+    end
+
+    context 'when there are staged changes' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          echo('Hello Other World', 'other-tracked-file')
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
+          echo('Hello Again', 'untracked-file')
+          echo('Some more text', 'tracked-file', append: true)
+          echo('Some more text', 'other-tracked-file', append: true)
+          `git add tracked-file`
+          echo('Yet some more text', 'tracked-file', append: true)
+          example.run
+        end
+      end
+
+      it 'keeps staged changes' do
+        subject
+        File.open('tracked-file', 'r').read.should == "Hello World\nSome more text\n"
+      end
+
+      it 'does not keep unstaged changes' do
+        subject
+        File.open('other-tracked-file', 'r').read.should == "Hello Other World\n"
+      end
+
+      it 'keeps untracked files' do
+        subject
+        File.open('untracked-file', 'r').read.should == "Hello Again\n"
+      end
+
+      it 'keeps modification times the same' do
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
+      end
+    end
+
+    context 'when all changes have been staged' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          `git add tracked-file`
+          `git commit -m "Add tracked-file"`
+          echo('Hello Other World', 'other-tracked-file')
+          `git add other-tracked-file`
+          example.run
+        end
+      end
+
+      it 'does not stash changes' do
+        expect(context.private_methods).to include :stash_changes
+        expect(context).not_to receive(:stash_changes)
+        subject
+      end
+    end
+
+    context 'when renaming a file during an amendment' do
+      around do |example|
+        repo do
+          `git commit --allow-empty -m "Initial commit"`
+          touch 'some-file'
+          `git add some-file`
+          `git commit -m "Add file"`
+          `git mv some-file renamed-file`
+          example.run
+        end
+      end
+
+      before do
+        context.stub(:amendment?).and_return(true)
+      end
+
+      it 'does not try to update modification time of the old non-existent file' do
+        File.should_receive(:mtime).with(/renamed-file/)
+        File.should_not_receive(:mtime).with(/some-file/)
+        subject
+      end
+    end
+
+    context 'when only a submodule change is staged' do
+      around do |example|
+        submodule = repo do
+          `git commit --allow-empty -m "Initial commit"`
+        end
+
+        repo do
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git commit -m "Add submodule"`
+          echo('Hello World', 'sub/submodule-file')
+          `git submodule foreach "git add submodule-file" < #{File::NULL}`
+          `git submodule foreach "git config --local commit.gpgsign false"`
+          `git submodule foreach "git commit -m \\"Another commit\\"" < #{File::NULL}`
+          `git add sub`
+          example.run
+        end
+      end
+
+      it 'keeps staged submodule change' do
+        `git config diff.submodule short`
+        expect { subject }.to_not change {
+          (`git diff --cached` =~ /-Subproject commit[\s\S]*\+Subproject commit/).nil?
+        }.from(false)
+      end
+    end
+
+    # Git cannot track Windows symlinks
+    unless Overcommit::OS.windows?
+      context 'when a broken symlink is staged' do
+        around do |example|
+          repo do
+            Overcommit::Utils::FileUtils.symlink('non-existent-file', 'symlink')
+            `git add symlink`
+            example.run
+          end
+        end
+
+        it 'does not attempt to update/restore the modification time of the file' do
+          File.should_not_receive(:mtime)
+          File.should_not_receive(:utime)
+          subject
+        end
+      end
+    end
+  end
+
+  describe '#cleanup_environment' do
+    subject { context.cleanup_environment }
+
+    before do
+      context.setup_environment
+    end
+
+    context 'when there were no staged changes' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          echo('Hello Other World', 'other-tracked-file')
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
+          echo('Hello Again', 'untracked-file')
+          echo('Some more text', 'other-tracked-file', append: true)
+          example.run
+        end
+      end
+
+      it 'restores the unstaged changes' do
+        subject
+        File.open('other-tracked-file', 'r').read.
+          should == "Hello Other World\nSome more text\n"
+      end
+
+      it 'keeps already-committed files' do
+        subject
+        File.open('tracked-file', 'r').read.should == "Hello World\n"
+      end
+
+      it 'keeps untracked files' do
+        subject
+        File.open('untracked-file', 'r').read.should == "Hello Again\n"
+      end
+
+      it 'keeps modification times the same' do
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
+      end
+    end
+
+    context 'when there were staged changes' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          echo('Hello Other World', 'other-tracked-file')
+          `git add tracked-file other-tracked-file`
+          `git commit -m "Add tracked-file and other-tracked-file"`
+          echo('Hello Again', 'untracked-file')
+          echo('Some more text', 'tracked-file', append: true)
+          echo('Some more text', 'other-tracked-file', append: true)
+          `git add tracked-file`
+          echo('Yet some more text', 'tracked-file', append: true)
+          example.run
+        end
+      end
+
+      it 'restores the unstaged changes' do
+        subject
+        File.open('tracked-file', 'r').read.
+          should == "Hello World\nSome more text\nYet some more text\n"
+      end
+
+      it 'keeps staged changes' do
+        subject
+        `git show :tracked-file`.should == "Hello World\nSome more text\n"
+      end
+
+      it 'keeps untracked files' do
+        subject
+        File.open('untracked-file', 'r').read.should == "Hello Again\n"
+      end
+
+      it 'keeps modification times the same' do
+        sleep 1
+        expect { subject }.to_not change {
+          [
+            File.mtime('tracked-file'),
+            File.mtime('other-tracked-file'),
+            File.mtime('untracked-file')
+          ]
+        }
+      end
+    end
+
+    context 'when all changes were staged' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          `git add tracked-file`
+          `git commit -m "Add tracked-file"`
+          echo('Hello Other World', 'other-tracked-file')
+          `git add other-tracked-file`
+          example.run
+        end
+      end
+
+      it 'does not touch the working tree' do
+        expect(context.private_methods).to include :clear_working_tree
+        expect(context.private_methods).to include :restore_working_tree
+        expect(context).not_to receive(:clear_working_tree)
+        expect(context).not_to receive(:restore_working_tree)
+        subject
+      end
+    end
+
+    context 'when there were deleted files' do
+      around do |example|
+        repo do
+          echo('Hello World', 'tracked-file')
+          `git add tracked-file`
+          `git commit -m "Add tracked-file"`
+          `git rm tracked-file`
+          example.run
+        end
+      end
+
+      it 'deletes the file' do
+        subject
+        File.exist?('tracked-file').should == false
+      end
+    end
+
+    context 'when only a submodule change was staged' do
+      around do |example|
+        submodule = repo do
+          `git commit --allow-empty -m "Initial commit"`
+        end
+
+        repo do
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git commit -m "Add submodule"`
+          echo('Hello World', 'sub/submodule-file')
+          `git submodule foreach "git add submodule-file" < #{File::NULL}`
+          `git submodule foreach "git config --local commit.gpgsign false"`
+          `git submodule foreach "git commit -m \\"Another commit\\"" < #{File::NULL}`
+          `git add sub`
+          example.run
+        end
+      end
+
+      it 'keeps staged submodule change' do
+        `git config diff.submodule short`
+        expect { subject }.to_not change {
+          (`git diff --cached` =~ /-Subproject commit[\s\S]*\+Subproject commit/).nil?
+        }.from(false)
+      end
+    end
+
+    context 'when submodule changes were staged along with other changes' do
+      around do |example|
+        submodule = repo do
+          `git commit --allow-empty -m "Initial commit"`
+        end
+
+        repo do
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git commit -m "Add submodule"`
+          echo('Hello World', 'sub/submodule-file')
+          `git submodule foreach "git add submodule-file" < #{File::NULL}`
+          `git submodule foreach "git config --local commit.gpgsign false"`
+          `git submodule foreach "git commit -m \\"Another commit\\"" < #{File::NULL}`
+          echo('Hello Again', 'tracked-file')
+          `git add sub tracked-file`
+          example.run
+        end
+      end
+
+      it 'keeps staged submodule change' do
+        `git config diff.submodule short`
+        expect { subject }.to_not change {
+          (`git diff --cached` =~ /-Subproject commit[\s\S]*\+Subproject commit/).nil?
+        }.from(false)
+      end
+
+      it 'keeps staged file change' do
+        subject
+        `git show :tracked-file`.should == "Hello Again\n"
+      end
+    end
+
+    context 'when a submodule removal was staged' do
+      around do |example|
+        submodule = repo do
+          `git commit --allow-empty -m "Initial commit"`
+        end
+
+        repo do
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git commit -m "Add submodule"`
+          `git rm sub`
+          example.run
+        end
+      end
+
+      it 'does not leave behind an empty submodule directory' do
+        subject
+        File.exist?('sub').should == false
+      end
+    end
+  end
+
+  describe '#modified_files' do
+    subject { context.modified_files }
+
+    before do
+      context.stub(:amendment?).and_return(false)
+    end
+
+    it 'does not include submodules' do
+      submodule = repo do
+        touch 'foo'
+        `git add foo`
+        `git commit -m "Initial commit"`
+      end
+
+      repo do
+        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        expect(subject).to_not include File.expand_path('test-sub')
+      end
+    end
+
+    context 'when no files were staged' do
+      around do |example|
+        repo do
+          example.run
+        end
+      end
+
+      it { should be_empty }
+    end
+
+    context 'when files were added' do
+      around do |example|
+        repo do
+          touch('some-file')
+          `git add some-file`
+          example.run
+        end
+      end
+
+      it { should == [File.expand_path('some-file')] }
+    end
+
+    context 'when files were modified' do
+      around do |example|
+        repo do
+          touch('some-file')
+          `git add some-file`
+          `git commit -m "Initial commit"`
+          echo('Hello', 'some-file')
+          `git add some-file`
+          example.run
+        end
+      end
+
+      it { should == [File.expand_path('some-file')] }
+    end
+
+    context 'when files were deleted' do
+      around do |example|
+        repo do
+          touch('some-file')
+          `git add some-file`
+          `git commit -m "Initial commit"`
+          `git rm some-file`
+          example.run
+        end
+      end
+
+      it { should be_empty }
+    end
+
+    context 'when amending last commit' do
+      around do |example|
+        repo do
+          touch('some-file')
+          `git add some-file`
+          `git commit -m "Initial commit"`
+          touch('other-file')
+          `git add other-file`
+          example.run
+        end
+      end
+
+      before do
+        context.stub(:amendment?).and_return(true)
+      end
+
+      it { should =~ [File.expand_path('some-file'), File.expand_path('other-file')] }
+    end
+
+    context 'when renaming a file during an amendment' do
+      around do |example|
+        repo do
+          `git commit --allow-empty -m "Initial commit"`
+          touch 'some-file'
+          `git add some-file`
+          `git commit -m "Add file"`
+          `git mv some-file renamed-file`
+          example.run
+        end
+      end
+
+      before do
+        context.stub(:amendment?).and_return(true)
+      end
+
+      it 'does not include the old file name in the list of modified files' do
+        subject.should_not include File.expand_path('some-file')
+      end
+    end
+
+    # Git cannot track Windows symlinks
+    unless Overcommit::OS.windows?
+      context 'when changing a symlink to a directory during an amendment' do
+        around do |example|
+          repo do
+            `git commit --allow-empty -m "Initial commit"`
+            FileUtils.mkdir 'some-directory'
+            symlink('some-directory', 'some-symlink')
+            `git add some-symlink some-directory`
+            `git commit -m "Add file"`
+            `git rm some-symlink`
+            FileUtils.mkdir 'some-symlink'
+            touch File.join('some-symlink', 'another-file')
+            `git add some-symlink`
+            example.run
+          end
+        end
+
+        before do
+          context.stub(:amendment?).and_return(true)
+        end
+
+        it 'does not include the directory in the list of modified files' do
+          subject.should_not include File.expand_path('some-symlink')
+        end
+      end
+
+      context 'when breaking a symlink during an amendment' do
+        around do |example|
+          repo do
+            `git commit --allow-empty -m "Initial commit"`
+            FileUtils.mkdir 'some-directory'
+            touch File.join('some-directory', 'some-file')
+            symlink('some-directory', 'some-symlink')
+            `git add some-symlink some-directory`
+            `git commit -m "Add file"`
+            `git rm -rf some-directory`
+            example.run
+          end
+        end
+
+        before do
+          context.stub(:amendment?).and_return(true)
+        end
+
+        it 'still includes the broken symlink in the list of modified files' do
+          subject.should include File.expand_path('some-symlink')
+        end
+      end
+    end
+  end
+
+  describe '#modified_lines_in_file' do
+    let(:modified_file) { 'some-file' }
+    subject { context.modified_lines_in_file(modified_file) }
+
+    before do
+      context.stub(:amendment?).and_return(false)
+    end
+
+    context 'when file contains a trailing newline' do
+      around do |example|
+        repo do
+          File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
+          `git add #{modified_file}`
+          example.run
+        end
+      end
+
+      it { should == Set.new(1..3) }
+    end
+
+    context 'when file does not contain a trailing newline' do
+      around do |example|
+        repo do
+          File.open(modified_file, 'w') do |f|
+            (1..2).each { |i| f.write("#{i}\n") }
+            f.write(3)
+          end
+
+          `git add #{modified_file}`
+          example.run
+        end
+      end
+
+      it { should == Set.new(1..3) }
+    end
+
+    context 'when amending last commit' do
+      around do |example|
+        repo do
+          File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
+          `git add #{modified_file}`
+          `git commit -m "Add files"`
+          File.open(modified_file, 'a') { |f| f.puts 4 }
+          `git add #{modified_file}`
+          example.run
+        end
+      end
+
+      before do
+        context.stub(:amendment?).and_return(true)
+      end
+
+      it { should == Set.new(1..4) }
+    end
+  end
 end

From d699c7756876633e5b06e3e02108316cc44467da Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 21 Sep 2020 21:50:33 -0700
Subject: [PATCH 144/223] Update change log

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54dfd994..7daa6227 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Update `ReplaceBranch` prepare-commit-msg hook to avoid running on `--amend` by default.
+* Add support for `modified_files` and `modified_lines_in_file` in `CommitMsg` hooks.
+
 ## 0.55.0
 
 * Fix `GoFmt` to not be enabled by default. This was enabled by mistake when introduced in Overcommit `0.52.0`.

From 50ab11a3f88c3abb706d26891182eef037f4ccc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zaj=C4=85c?= <michal.zajac@gmail.com>
Date: Fri, 25 Sep 2020 18:57:37 +0200
Subject: [PATCH 145/223] Make #initial_commit? public (#729)

Closes #728
---
 .../hook_context/helpers/stash_unstaged_changes.rb   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
index e015453a..f2866bd5 100644
--- a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
+++ b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
@@ -23,6 +23,12 @@ def setup_environment
         end
       end
 
+      # Returns whether the current git branch is empty (has no commits).
+      def initial_commit?
+        return @initial_commit unless @initial_commit.nil?
+        @initial_commit = Overcommit::GitRepo.initial_commit?
+      end
+
       # Restore unstaged changes and reset file modification times so it appears
       # as if nothing ever changed.
       #
@@ -61,12 +67,6 @@ def store_modified_times
         end
       end
 
-      # Returns whether the current git branch is empty (has no commits).
-      def initial_commit?
-        return @initial_commit unless @initial_commit.nil?
-        @initial_commit = Overcommit::GitRepo.initial_commit?
-      end
-
       # Returns whether there are any changes to tracked files which have not yet
       # been staged.
       def unstaged_changes?

From 7c2ebb2282fa7eb66173dca1512a2d5cfff8650e Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 25 Sep 2020 09:59:14 -0700
Subject: [PATCH 146/223] Cut version 0.56.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7daa6227..9580ea83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.56.0
 
 * Update `ReplaceBranch` prepare-commit-msg hook to avoid running on `--amend` by default.
 * Add support for `modified_files` and `modified_lines_in_file` in `CommitMsg` hooks.
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index d9528301..1f9817d3 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.55.0'
+  VERSION = '0.56.0'
 end

From ed0d0ec86a880a8c757ab56f3b0ba2551f2eb3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zaj=C4=85c?= <michal.zajac@gmail.com>
Date: Sat, 3 Oct 2020 02:56:00 +0200
Subject: [PATCH 147/223] Delegate `modified_lines_in_file` to context (#730)

This went under the radar since `modified_files` is delegated via
`Overcommit::Hook::Base`.
---
 lib/overcommit/hook/commit_msg/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/commit_msg/base.rb b/lib/overcommit/hook/commit_msg/base.rb
index 2b46a66e..f99f53fc 100644
--- a/lib/overcommit/hook/commit_msg/base.rb
+++ b/lib/overcommit/hook/commit_msg/base.rb
@@ -9,6 +9,6 @@ class Base < Overcommit::Hook::Base
 
     def_delegators :@context, :empty_message?, :commit_message,
                    :update_commit_message, :commit_message_lines,
-                   :commit_message_file
+                   :commit_message_file, :modified_lines_in_file
   end
 end

From a3521a03c6d75216cda6d1eee2c1a5daaa24f74d Mon Sep 17 00:00:00 2001
From: Dennis Paagman <dennispaagman@gmail.com>
Date: Sat, 3 Oct 2020 02:56:44 +0200
Subject: [PATCH 148/223] Add pre commit hook for erblint (#731)

---
 config/default.yml                            |  7 +++
 lib/overcommit/hook/pre_commit/erb_lint.rb    | 20 +++++++++
 .../hook/pre_commit/erb_lint_spec.rb          | 45 +++++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/erb_lint.rb
 create mode 100644 spec/overcommit/hook/pre_commit/erb_lint_spec.rb

diff --git a/config/default.yml b/config/default.yml
index 27794ffe..748476e8 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -275,6 +275,13 @@ PreCommit:
       - '**/*.ex'
       - '**/*.exs'
 
+  ErbLint:
+    enabled: false
+    description: 'Analyze with ERB Lint'
+    required_executable: 'erblint'
+    install_command: 'bundle install erb_lint'
+    include: '**/*.html.erb'
+
   EsLint:
     enabled: false
     description: 'Analyze with ESLint'
diff --git a/lib/overcommit/hook/pre_commit/erb_lint.rb b/lib/overcommit/hook/pre_commit/erb_lint.rb
new file mode 100644
index 00000000..2073538c
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/erb_lint.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `erblint` against any modified ERB files.
+  #
+  # @see https://github.com/Shopify/erb-lint
+  class ErbLint < Base
+    MESSAGE_REGEX = /(?<message>.+)\nIn file: (?<file>.+):(?<line>\d+)/
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n\n")[1..-1],
+        MESSAGE_REGEX
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/erb_lint_spec.rb b/spec/overcommit/hook/pre_commit/erb_lint_spec.rb
new file mode 100644
index 00000000..fcb17199
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/erb_lint_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::ErbLint do
+  let(:config) { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.html.erb file2.html.erb])
+  end
+
+  context 'when erblint exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when erblint exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return(<<-MSG)
+Linting 1 files with 14 linters...
+
+erb interpolation with '<%= (...).html_safe %>' in this context is never safe
+In file: app/views/posts/show.html.erb:10
+MSG
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From c94bd13e1fac0de6bddfb790361f6f83a6552933 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 2 Oct 2020 17:59:44 -0700
Subject: [PATCH 149/223] Cut version 0.57.0

---
 CHANGELOG.md              | 5 +++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9580ea83..ca3d3627 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## 0.57.0
+
+* Fix `CommitMsg` hooks to be able to call `modified_lines_in_file`.
+* Add `ErbLint` pre-commit hook to lint ERB files.
+
 ## 0.56.0
 
 * Update `ReplaceBranch` prepare-commit-msg hook to avoid running on `--amend` by default.
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 1f9817d3..b13414fe 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.56.0'
+  VERSION = '0.57.0'
 end

From a78b3bf325822db47c9b5dc1c8ee2dc9fa9f8c86 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 2 Oct 2020 18:04:52 -0700
Subject: [PATCH 150/223] Add ErbLint pre-commit hook to README

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 345c0aa1..e1c3911b 100644
--- a/README.md
+++ b/README.md
@@ -499,6 +499,7 @@ issue](https://github.com/sds/overcommit/issues/238) for more details.
 * [Credo](lib/overcommit/hook/pre_commit/credo.rb)
 * [CssLint](lib/overcommit/hook/pre_commit/css_lint.rb)
 * [Dogma](lib/overcommit/hook/pre_commit/dogma.rb)
+* [ErbLint](lib/overcommit/hook/pre_commit/erb_lint.rb)
 * [EsLint](lib/overcommit/hook/pre_commit/es_lint.rb)
 * [ExecutePermissions](lib/overcommit/hook/pre_commit/execute_permissions.rb)
 * [Fasterer](lib/overcommit/hook/pre_commit/fasterer.rb)

From 3174250ea04e54922d0c12f08ec907d29758d58b Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@coinbase.com>
Date: Fri, 2 Oct 2020 18:12:56 -0700
Subject: [PATCH 151/223] Add Ruby 2.7 to CI test runs (#732)

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index f12366a7..823e5966 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 before_script:
   - git config --global user.email "travis@travis.ci"

From 7312d5e4afa39628ddfd46b8c72d5fc35eaae1fe Mon Sep 17 00:00:00 2001
From: Kevin McCormack <harlemsquirrel@mccormack.tech>
Date: Fri, 12 Feb 2021 12:34:46 -0500
Subject: [PATCH 152/223] Update for Ruby 3.0 (#741)

rexml is no longer default gem in Ruby 3.0
---
 .travis.yml        | 1 +
 overcommit.gemspec | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 823e5966..7b489462 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
 
 before_script:
   - git config --global user.email "travis@travis.ci"
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 75704056..ef9f24fc 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency          'childprocess', '>= 0.6.3', '< 5'
   s.add_dependency          'iniparse', '~> 1.4'
+  s.add_dependency          'rexml', '~> 3.2'
 end

From fd3c3c0b99dba7577a9220c3b28ced9810d04310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Fri, 12 Feb 2021 18:35:32 +0100
Subject: [PATCH 153/223] Add dartanalyzer pre-commit hook (#739)

* Add dartanalyzer pre-commit hook

* Fix lint issues

* Add lint message type categorization for DartAnalyzer
---
 README.md                                     |  1 +
 config/default.yml                            |  8 ++++
 .../hook/pre_commit/dart_analyzer.rb          | 22 +++++++++
 .../hook/pre_commit/dart_analyzer_spec.rb     | 47 +++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/dart_analyzer.rb
 create mode 100644 spec/overcommit/hook/pre_commit/dart_analyzer_spec.rb

diff --git a/README.md b/README.md
index e1c3911b..ab023c7e 100644
--- a/README.md
+++ b/README.md
@@ -498,6 +498,7 @@ issue](https://github.com/sds/overcommit/issues/238) for more details.
 * [CoffeeLint](lib/overcommit/hook/pre_commit/coffee_lint.rb)
 * [Credo](lib/overcommit/hook/pre_commit/credo.rb)
 * [CssLint](lib/overcommit/hook/pre_commit/css_lint.rb)
+* [DartAnalyzer](lib/overcommit/hook/pre_commit/dart_analyzer.rb)
 * [Dogma](lib/overcommit/hook/pre_commit/dogma.rb)
 * [ErbLint](lib/overcommit/hook/pre_commit/erb_lint.rb)
 * [EsLint](lib/overcommit/hook/pre_commit/es_lint.rb)
diff --git a/config/default.yml b/config/default.yml
index 748476e8..7207ade6 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -266,6 +266,14 @@ PreCommit:
     install_command: 'npm install -g csslint'
     include: '**/*.css'
 
+  DartAnalyzer:
+    enabled: false
+    description: 'Analyze with dartanalyzer'
+    required_executable: 'dartanalyzer'
+    flags: []
+    include:
+      - '**/*.dart'
+
   Dogma:
     enabled: false
     description: 'Analyze with dogma'
diff --git a/lib/overcommit/hook/pre_commit/dart_analyzer.rb b/lib/overcommit/hook/pre_commit/dart_analyzer.rb
new file mode 100644
index 00000000..a1c99448
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/dart_analyzer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `dartanalyzer` against modified Dart files.
+  # @see https://dart.dev/tools/dartanalyzer
+  class DartAnalyzer < Base
+    MESSAGE_REGEX = /(?<type>.*)•\ (?<message>[^•]+)•\ (?<file>[^:]+):(?<line>\d+):(\d+)\.*/
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n").grep(MESSAGE_REGEX),
+        MESSAGE_REGEX,
+        lambda do |type|
+          type.include?('error') ? :error : :warning
+        end
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/dart_analyzer_spec.rb b/spec/overcommit/hook/pre_commit/dart_analyzer_spec.rb
new file mode 100644
index 00000000..1013c503
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/dart_analyzer_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::DartAnalyzer do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.dart file2.dart])
+  end
+
+  context 'when dartanalyzer exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when dartanalyzer exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return([
+          'Analyzing file1.dart...',
+          'error • message_ommitted • lib/file1.dart:35:3 • rule',
+          'Analyzing file2.dart...',
+          'hint • message_ommitted • lib/file2.dart:100:13 • rule',
+          'info • message_ommitted • lib/file2.dart:113:16 • rule',
+          '3 lints found.'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From bba5b75b2c16efccf2dbbbe4f2af103a15011119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Fri, 12 Feb 2021 18:39:49 +0100
Subject: [PATCH 154/223] Add pub test and flutter test pre-push hooks (#740)

---
 README.md                                     |   2 +
 config/default.yml                            |  12 ++
 lib/overcommit/hook/pre_push/flutter_test.rb  |  16 ++
 lib/overcommit/hook/pre_push/pub_test.rb      |  16 ++
 .../hook/pre_push/flutter_test_spec.rb        | 167 ++++++++++++++++++
 .../overcommit/hook/pre_push/pub_test_spec.rb |  61 +++++++
 6 files changed, 274 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_push/flutter_test.rb
 create mode 100644 lib/overcommit/hook/pre_push/pub_test.rb
 create mode 100644 spec/overcommit/hook/pre_push/flutter_test_spec.rb
 create mode 100644 spec/overcommit/hook/pre_push/pub_test_spec.rb

diff --git a/README.md b/README.md
index ab023c7e..36126a2c 100644
--- a/README.md
+++ b/README.md
@@ -581,10 +581,12 @@ but before any objects have been transferred. If a hook fails, the push is
 aborted.
 
 * [Brakeman](lib/overcommit/hook/pre_push/brakeman.rb)
+* [FlutterTest](lib/overcommit/hook/pre_push/flutter_test.rb)
 * [Minitest](lib/overcommit/hook/pre_push/minitest.rb)
 * [PhpUnit](lib/overcommit/hook/pre_push/php_unit.rb)
 * [Pronto](lib/overcommit/hook/pre_push/pronto.rb)
 * [ProtectedBranches](lib/overcommit/hook/pre_push/protected_branches.rb)
+* [PubTest](lib/overcommit/hook/pre_push/pub_test.rb)
 * [Pytest](lib/overcommit/hook/pre_push/pytest.rb)
 * [PythonNose](lib/overcommit/hook/pre_push/python_nose.rb)
 * [RakeTarget](lib/overcommit/hook/pre_push/rake_target.rb)
diff --git a/config/default.yml b/config/default.yml
index 7207ade6..bfd91e08 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1284,6 +1284,12 @@ PrePush:
     flags: ['test']
     include: 'src/**/*.rs'
 
+  FlutterTest:
+    enabled: false
+    description: 'Run flutter test suite'
+    required_executable: 'flutter'
+    flags: ['test']
+
   GitLfs:
     enabled: false
     description: 'Upload files tracked by Git LFS'
@@ -1330,6 +1336,12 @@ PrePush:
     destructive_only: true
     branches: ['master']
 
+  PubTest:
+    enabled: false
+    description: 'Run pub test suite'
+    required_executable: 'pub'
+    flags: ['run', 'test']
+
   Pytest:
     enabled: false
     description: 'Run pytest test suite'
diff --git a/lib/overcommit/hook/pre_push/flutter_test.rb b/lib/overcommit/hook/pre_push/flutter_test.rb
new file mode 100644
index 00000000..26c987cf
--- /dev/null
+++ b/lib/overcommit/hook/pre_push/flutter_test.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs Flutter test suite (`flutter test`) before push
+  #
+  # @see https://api.flutter.dev/flutter/flutter_test/flutter_test-library.html
+  class FlutterTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end
diff --git a/lib/overcommit/hook/pre_push/pub_test.rb b/lib/overcommit/hook/pre_push/pub_test.rb
new file mode 100644
index 00000000..0dbfb0bf
--- /dev/null
+++ b/lib/overcommit/hook/pre_push/pub_test.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs Dart test suite (`pub run test`) before push
+  #
+  # @see https://pub.dev/packages/test#running-tests
+  class PubTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/flutter_test_spec.rb b/spec/overcommit/hook/pre_push/flutter_test_spec.rb
new file mode 100644
index 00000000..a5bce582
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/flutter_test_spec.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::FlutterTest do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  context 'when flutter test exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when flutter test exits unsuccessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'with a runtime error' do
+      before do
+        result.stub(stdout: '', stderr: <<-MSG)
+          0:03 +0: Counter increments smoke test
+          ══╡ EXCEPTION CAUGHT BY FLUTTER TEST FRAMEWORK ╞════════════════════════════════════════════════════
+          The following _Exception was thrown running a test:
+          Exception
+
+          When the exception was thrown, this was the stack:
+          #0      main.<anonymous closure> (file:///Users/user/project/test/widget_test.dart:18:5)
+          <asynchronous suspension>
+          #1      main.<anonymous closure> (file:///Users/user/project/test/widget_test.dart)
+          #2      testWidgets.<anonymous closure>.<anonymous closure> (package:flutter_test/src/widget_tester.dart:146:29)
+          <asynchronous suspension>
+          #3      testWidgets.<anonymous closure>.<anonymous closure> (package:flutter_test/src/widget_tester.dart)
+          #4      TestWidgetsFlutterBinding._runTestBody (package:flutter_test/src/binding.dart:784:19)
+          <asynchronous suspension>
+          #7      TestWidgetsFlutterBinding._runTest (package:flutter_test/src/binding.dart:764:14)
+          #8      AutomatedTestWidgetsFlutterBinding.runTest.<anonymous closure> (package:flutter_test/src/binding.dart:1173:24)
+          #9      FakeAsync.run.<anonymous closure>.<anonymous closure> (package:fake_async/fake_async.dart:178:54)
+          #14     withClock (package:clock/src/default.dart:48:10)
+          #15     FakeAsync.run.<anonymous closure> (package:fake_async/fake_async.dart:178:22)
+          #20     FakeAsync.run (package:fake_async/fake_async.dart:178:7)
+          #21     AutomatedTestWidgetsFlutterBinding.runTest (package:flutter_test/src/binding.dart:1170:15)
+          #22     testWidgets.<anonymous closure> (package:flutter_test/src/widget_tester.dart:138:24)
+          #23     Declarer.test.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/declarer.dart:175:19)
+          <asynchronous suspension>
+          #24     Declarer.test.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/declarer.dart)
+          #29     Declarer.test.<anonymous closure> (package:test_api/src/backend/declarer.dart:173:13)
+          #30     Invoker.waitForOutstandingCallbacks.<anonymous closure> (package:test_api/src/backend/invoker.dart:231:15)
+          #35     Invoker.waitForOutstandingCallbacks (package:test_api/src/backend/invoker.dart:228:5)
+          #36     Invoker._onRun.<anonymous closure>.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/invoker.dart:383:17)
+          <asynchronous suspension>
+          #37     Invoker._onRun.<anonymous closure>.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/invoker.dart)
+          #42     Invoker._onRun.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/invoker.dart:370:9)
+          #43     Invoker._guardIfGuarded (package:test_api/src/backend/invoker.dart:415:15)
+          #44     Invoker._onRun.<anonymous closure> (package:test_api/src/backend/invoker.dart:369:7)
+          #51     Invoker._onRun (package:test_api/src/backend/invoker.dart:368:11)
+          #52     LiveTestController.run (package:test_api/src/backend/live_test_controller.dart:153:11)
+          #53     RemoteListener._runLiveTest.<anonymous closure> (package:test_api/src/remote_listener.dart:256:16)
+          #58     RemoteListener._runLiveTest (package:test_api/src/remote_listener.dart:255:5)
+          #59     RemoteListener._serializeTest.<anonymous closure> (package:test_api/src/remote_listener.dart:208:7)
+          #77     _GuaranteeSink.add (package:stream_channel/src/guarantee_channel.dart:125:12)
+          #78     new _MultiChannel.<anonymous closure> (package:stream_channel/src/multi_channel.dart:159:31)
+          #82     CastStreamSubscription._onData (dart:_internal/async_cast.dart:85:11)
+          #116    new _WebSocketImpl._fromSocket.<anonymous closure> (dart:_http/websocket_impl.dart:1145:21)
+          #124    _WebSocketProtocolTransformer._messageFrameEnd (dart:_http/websocket_impl.dart:338:23)
+          #125    _WebSocketProtocolTransformer.add (dart:_http/websocket_impl.dart:232:46)
+          #135    _Socket._onData (dart:io-patch/socket_patch.dart:2044:41)
+          #144    new _RawSocket.<anonymous closure> (dart:io-patch/socket_patch.dart:1580:33)
+          #145    _NativeSocket.issueReadEvent.issue (dart:io-patch/socket_patch.dart:1076:14)
+          (elided 111 frames from dart:async and package:stack_trace)
+
+          The test description was:
+            Counter increments smoke test
+          ════════════════════════════════════════════════════════════════════════════════════════════════════
+          00:03 +0 -1: Counter increments smoke test [E]
+            Test failed. See exception logs above.
+            The test description was: Counter increments smoke test
+
+          00:03 +0 -1: Some tests failed.
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+
+    context 'with a test failure' do
+      before do
+        result.stub(stderr: '', stdout: <<-MSG)
+          00:02 +0: Counter increments smoke test
+          ══╡ EXCEPTION CAUGHT BY FLUTTER TEST FRAMEWORK ╞════════════════════════════════════════════════════
+          The following TestFailure object was thrown running a test:
+            Expected: exactly one matching node in the widget tree
+            Actual: _TextFinder:<zero widgets with text "1" (ignoring offstage widgets)>
+             Which: means none were found but one was expected
+
+          When the exception was thrown, this was the stack:
+          #4      main.<anonymous closure> (file:///Users/user/project/test/widget_test.dart:19:5)
+          <asynchronous suspension>
+          #5      main.<anonymous closure> (file:///Users/user/project/test/widget_test.dart)
+          #6      testWidgets.<anonymous closure>.<anonymous closure> (package:flutter_test/src/widget_tester.dart:146:29)
+          <asynchronous suspension>
+          #7      testWidgets.<anonymous closure>.<anonymous closure> (package:flutter_test/src/widget_tester.dart)
+          #8      TestWidgetsFlutterBinding._runTestBody (package:flutter_test/src/binding.dart:784:19)
+          <asynchronous suspension>
+          #11     TestWidgetsFlutterBinding._runTest (package:flutter_test/src/binding.dart:764:14)
+          #12     AutomatedTestWidgetsFlutterBinding.runTest.<anonymous closure> (package:flutter_test/src/binding.dart:1173:24)
+          #13     FakeAsync.run.<anonymous closure>.<anonymous closure> (package:fake_async/fake_async.dart:178:54)
+          #18     withClock (package:clock/src/default.dart:48:10)
+          #19     FakeAsync.run.<anonymous closure> (package:fake_async/fake_async.dart:178:22)
+          #24     FakeAsync.run (package:fake_async/fake_async.dart:178:7)
+          #25     AutomatedTestWidgetsFlutterBinding.runTest (package:flutter_test/src/binding.dart:1170:15)
+          #26     testWidgets.<anonymous closure> (package:flutter_test/src/widget_tester.dart:138:24)
+          #27     Declarer.test.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/declarer.dart:175:19)
+          <asynchronous suspension>
+          #28     Declarer.test.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/declarer.dart)
+          #33     Declarer.test.<anonymous closure> (package:test_api/src/backend/declarer.dart:173:13)
+          #34     Invoker.waitForOutstandingCallbacks.<anonymous closure> (package:test_api/src/backend/invoker.dart:231:15)
+          #39     Invoker.waitForOutstandingCallbacks (package:test_api/src/backend/invoker.dart:228:5)
+          #40     Invoker._onRun.<anonymous closure>.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/invoker.dart:383:17)
+          <asynchronous suspension>
+          #41     Invoker._onRun.<anonymous closure>.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/invoker.dart)
+          #46     Invoker._onRun.<anonymous closure>.<anonymous closure> (package:test_api/src/backend/invoker.dart:370:9)
+          #47     Invoker._guardIfGuarded (package:test_api/src/backend/invoker.dart:415:15)
+          #48     Invoker._onRun.<anonymous closure> (package:test_api/src/backend/invoker.dart:369:7)
+          #55     Invoker._onRun (package:test_api/src/backend/invoker.dart:368:11)
+          #56     LiveTestController.run (package:test_api/src/backend/live_test_controller.dart:153:11)
+          #57     RemoteListener._runLiveTest.<anonymous closure> (package:test_api/src/remote_listener.dart:256:16)
+          #62     RemoteListener._runLiveTest (package:test_api/src/remote_listener.dart:255:5)
+          #63     RemoteListener._serializeTest.<anonymous closure> (package:test_api/src/remote_listener.dart:208:7)
+          #81     _GuaranteeSink.add (package:stream_channel/src/guarantee_channel.dart:125:12)
+          #82     new _MultiChannel.<anonymous closure> (package:stream_channel/src/multi_channel.dart:159:31)
+          #86     CastStreamSubscription._onData (dart:_internal/async_cast.dart:85:11)
+          #120    new _WebSocketImpl._fromSocket.<anonymous closure> (dart:_http/websocket_impl.dart:1145:21)
+          #128    _WebSocketProtocolTransformer._messageFrameEnd (dart:_http/websocket_impl.dart:338:23)
+          #129    _WebSocketProtocolTransformer.add (dart:_http/websocket_impl.dart:232:46)
+          #139    _Socket._onData (dart:io-patch/socket_patch.dart:2044:41)
+          #148    new _RawSocket.<anonymous closure> (dart:io-patch/socket_patch.dart:1580:33)
+          #149    _NativeSocket.issueReadEvent.issue (dart:io-patch/socket_patch.dart:1076:14)
+          (elided 111 frames from dart:async and package:stack_trace)
+
+          This was caught by the test expectation on the following line:
+            file:///Users/user/project/test/widget_test.dart line 19
+          The test description was:
+            Counter increments smoke test
+          ════════════════════════════════════════════════════════════════════════════════════════════════════
+          00:02 +0 -1: Counter increments smoke test [E]
+            Test failed. See exception logs above.
+            The test description was: Counter increments smoke test
+
+          00:02 +0 -1: Some tests failed.
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/pub_test_spec.rb b/spec/overcommit/hook/pre_push/pub_test_spec.rb
new file mode 100644
index 00000000..41ff5c5d
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/pub_test_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::PubTest do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  context 'when pub test exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when pub test exits unsuccessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'with a runtime error' do
+      before do
+        result.stub(stdout: '', stderr: <<-MSG)
+          00:01 +0 -1: test/test_test.dart: String.split() splits the string on the delimiter [E]
+            Exception
+            test/test_test.dart 6:5  main.<fn>
+
+          00:01 +1 -1: Some tests failed.
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+
+    context 'with a test failure' do
+      before do
+        result.stub(stderr: '', stdout: <<-MSG)
+          00:01 +0 -1: test/test_test.dart: String.split() splits the string on the delimiter [E]
+            Expected: ['fooo', 'bar', 'baz']
+              Actual: ['foo', 'bar', 'baz']
+               Which: at location [0] is 'foo' instead of 'fooo'
+
+            package:test_api         expect
+            test/test_test.dart 6:5  main.<fn>
+
+          00:01 +1 -1: Some tests failed.
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From 6b25f5d60056614c58c5762a9c6e1fe8919742d2 Mon Sep 17 00:00:00 2001
From: bmckeough-showcaseidx
 <77012471+bmckeough-showcaseidx@users.noreply.github.com>
Date: Wed, 17 Feb 2021 22:35:55 -0600
Subject: [PATCH 155/223] Revise index-tags script (#742)

* Revise index-tags script

- based what files are included in tag generation on the files managed
by git. Exclude files not managed by git

* Revert ctags command to recursively tag all files
---
 libexec/index-tags | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libexec/index-tags b/libexec/index-tags
index 3c4478e2..51a6d516 100755
--- a/libexec/index-tags
+++ b/libexec/index-tags
@@ -6,10 +6,12 @@
 
 set -e
 
-trap "rm -f $GIT_DIR/tags.$$" EXIT
-err_file=$GIT_DIR/ctags.err
-if ctags --tag-relative -Rf$GIT_DIR/tags.$$ --exclude=.git "$@" 2>${err_file}; then
-  mv $GIT_DIR/tags.$$ $GIT_DIR/tags
+dir="`git rev-parse --git-dir`"
+
+trap "rm -f $dir/tags.$$" EXIT
+err_file=$dir/ctags.err
+if ctags --tag-relative -Rf$dir/tags.$$ --exclude=.git "$@" 2>${err_file}; then
+  mv $dir/tags.$$ $dir/tags
   [ -e ${err_file} ] && rm -f ${err_file}
 else
   # Ignore STDERR unless `ctags` returned a non-zero exit code

From 3d5c5db07974882171a7da785f09be5fd972e64b Mon Sep 17 00:00:00 2001
From: adam <adamvonbaron@outlook.com>
Date: Mon, 1 Mar 2021 22:34:37 -0500
Subject: [PATCH 156/223] dont capture false positives (#744)

---
 lib/overcommit/hook/pre_commit/es_lint.rb       |  9 +++------
 spec/overcommit/hook/pre_commit/es_lint_spec.rb | 12 ++++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/es_lint.rb b/lib/overcommit/hook/pre_commit/es_lint.rb
index ebbdd112..240d749d 100644
--- a/lib/overcommit/hook/pre_commit/es_lint.rb
+++ b/lib/overcommit/hook/pre_commit/es_lint.rb
@@ -19,20 +19,17 @@ module Overcommit::Hook::PreCommit
   # @see http://eslint.org/
   class EsLint < Base
     def run
+      eslint_regex = /^(?<file>[^\s](?:\w:)?[^:]+):[^\d]+(?<line>\d+).*?(?<type>Error|Warning)/
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
-      messages = output.split("\n").grep(/Warning|Error/)
+      messages = output.split("\n").grep(eslint_regex)
 
       return [:fail, result.stderr] if messages.empty? && !result.success?
       return :pass if result.success? && output.empty?
 
       # example message:
       #   path/to/file.js: line 1, col 0, Error - Error message (ruleName)
-      extract_messages(
-        messages,
-        /^(?<file>(?:\w:)?[^:]+):[^\d]+(?<line>\d+).*?(?<type>Error|Warning)/,
-        lambda { |type| type.downcase.to_sym }
-      )
+      extract_messages(messages, eslint_regex, lambda { |type| type.downcase.to_sym })
     end
   end
 end
diff --git a/spec/overcommit/hook/pre_commit/es_lint_spec.rb b/spec/overcommit/hook/pre_commit/es_lint_spec.rb
index bcb2cfdc..39de7d27 100644
--- a/spec/overcommit/hook/pre_commit/es_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/es_lint_spec.rb
@@ -52,6 +52,18 @@
 
       it { should warn }
     end
+
+    context 'and it doesnt count false positives error messages' do
+      before do
+        result.stub(:stdout).and_return([
+          '$ yarn eslint --quiet --format=compact /app/project/Error.ts',
+          '$ /app/project/node_modules/.bin/eslint --quiet --format=compact /app/project/Error.ts',
+          '',
+        ].join("\n"))
+      end
+
+      it { should pass }
+    end
   end
 
   context 'when eslint exits unsucessfully' do

From 192c84bad54c6d4ef2c3ab887968bb2ccd26cc0b Mon Sep 17 00:00:00 2001
From: Guillaume <Gui13@users.noreply.github.com>
Date: Tue, 2 Mar 2021 04:36:23 +0100
Subject: [PATCH 157/223] Fail on yaml lint errors (#738)

* Fail on yaml lint errors

Fixes https://github.com/sds/overcommit/issues/737

* Fix yaml lint spec after enabling failure on YamlLint

* Fix syntax error in yaml_lint.rb

* Use fail_hook instead of fail for spec file

* Fix if/else syntax to use elsif

* Fix yaml_lint linter errors
---
 lib/overcommit/hook/pre_commit/yaml_lint.rb       |  4 +++-
 spec/overcommit/hook/pre_commit/yaml_lint_spec.rb | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/yaml_lint.rb b/lib/overcommit/hook/pre_commit/yaml_lint.rb
index 2b24a932..a29bd8a0 100644
--- a/lib/overcommit/hook/pre_commit/yaml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_lint.rb
@@ -10,8 +10,10 @@ def run
 
       if result.success?
         :pass
+      elsif result.stdout.include?('error')
+        [:fail, result.stdout]
       else
-        return [:warn, result.stdout]
+        [:warn, result.stdout]
       end
     end
   end
diff --git a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
index cb08f4e1..a69b8122 100644
--- a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
@@ -34,9 +34,22 @@
       )
     end
 
-    it { should warn }
+    it { should fail_hook }
   end
 
+  context 'and has 1 error and 1 warning' do
+    let(:result) do
+      double(
+        success?: false,
+        stdout: <<-MSG
+file1.yaml:3:81: [error] line too long (253 > 80 characters) (line-length)
+file2.yml:41:81: [warning] missing document start "---" (document-start)
+      MSG
+      )
+    end
+
+    it { should fail_hook }
+  end
   context 'and has single suggestion for missing file header' do
     let(:result) do
       double(

From f7b52faa06dea58bd0b899714ed87a920f08ee86 Mon Sep 17 00:00:00 2001
From: Sean Millichamp <sean@bruenor.org>
Date: Sat, 1 May 2021 17:54:54 -0400
Subject: [PATCH 158/223] Add parsing of yamllint output (#747)

Parse the yamllint output so Overcommit has per-line awareness of
changes to support problem_on_unmodified_line option.
---
 lib/overcommit/hook/pre_commit/yaml_lint.rb | 31 +++++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/yaml_lint.rb b/lib/overcommit/hook/pre_commit/yaml_lint.rb
index a29bd8a0..1fd57513 100644
--- a/lib/overcommit/hook/pre_commit/yaml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_lint.rb
@@ -5,15 +5,34 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/adrienverge/yamllint
   class YamlLint < Base
+    MESSAGE_REGEX = /
+      ^(?<file>.+)
+      :(?<line>\d+)
+      :(?<col>\d+)
+      :\s\[(?<type>\w+)\]
+      \s(?<msg>.+)$
+    /x
+
     def run
       result = execute(command, args: applicable_files)
+      parse_messages(result.stdout)
+    end
+
+    private
+
+    def parse_messages(output)
+      repo_root = Overcommit::Utils.repo_root
+
+      output.scan(MESSAGE_REGEX).map do |file, line, col, type, msg|
+        line = line.to_i
+        type = type.to_sym
+        # Obtain the path relative to the root of the repository
+        # for nicer output:
+        relpath = file.dup
+        relpath.slice!("#{repo_root}/")
 
-      if result.success?
-        :pass
-      elsif result.stdout.include?('error')
-        [:fail, result.stdout]
-      else
-        [:warn, result.stdout]
+        text = "#{relpath}:#{line}:#{col}:#{type} #{msg}"
+        Overcommit::Hook::Message.new(type, file, line, text)
       end
     end
   end

From a8c72e117ac204d4d78c89f193d428e1e2149d0c Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 30 May 2021 20:46:25 -0700
Subject: [PATCH 159/223] Load YAML configuration file with `aliases: true`

Gracefully handle breaking behavior in upstream Psych gem to support
YAML aliases.
---
 CHANGELOG.md                           |  4 ++++
 lib/overcommit/configuration_loader.rb | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca3d3627..76a9083f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Gracefully handle breaking behavior in upstream Psych gem to support YAML aliases.
+
 ## 0.57.0
 
 * Fix `CommitMsg` hooks to be able to call `modified_lines_in_file`.
diff --git a/lib/overcommit/configuration_loader.rb b/lib/overcommit/configuration_loader.rb
index f884c41d..9ba96fb5 100644
--- a/lib/overcommit/configuration_loader.rb
+++ b/lib/overcommit/configuration_loader.rb
@@ -24,13 +24,16 @@ def default_configuration
       # @option logger [Overcommit::Logger]
       # @return [Overcommit::Configuration]
       def load_from_file(file, options = {})
-        hash =
-          if yaml = YAML.load_file(file)
-            yaml.to_hash
-          else
-            {}
+        # Psych 4 introduced breaking behavior that doesn't support aliases by
+        # default. Explicitly enable aliases if the option is available.
+        yaml =
+          begin
+            YAML.load_file(file, aliases: true)
+          rescue ArgumentError
+            YAML.load_file(file)
           end
 
+        hash = yaml ? yaml.to_hash : {}
         Overcommit::Configuration.new(hash, options)
       end
     end

From 10c96ebe5c1bf640c53cbac4362df1dd943d4b84 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 30 May 2021 20:58:26 -0700
Subject: [PATCH 160/223] Update change log

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76a9083f..51a15ccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## master (unreleased)
 
+* Add `rexml` dependency explicitly to support Ruby 3.0.
+* Add `DartAnalyzer` pre-commit hook to analyze Dart files.
+* Add `PubTest` and `FlutterTest` pre-push hooks to run `pub test` and `flutter test` for Dart projects, respectively.
+* Update `index-tags` script to support scanning only files tracked by Git.
+* Fix `EsLint` pre-commit hook to not report certain false positives.
+* Update `YamlLint` to `fail` the run instead of `warn` when errors are detected.
+* Update `YamlLint` parse the line number of output so it is line aware.
 * Gracefully handle breaking behavior in upstream Psych gem to support YAML aliases.
 
 ## 0.57.0

From 648383ff3cd9d51ab83de87f2bf64fa9a0d6d559 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 31 May 2021 09:12:13 -0700
Subject: [PATCH 161/223] Remove --quiet flag when popping stash

This was causing the entire repository to be deleted in situations where
there were no staged changes. It is a bug with the `--quiet` flag
itself: https://www.spinics.net/lists/git/msg369540.html

Work around by removing the flag. Fixes #734 and #751.
---
 lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
index f2866bd5..0d333098 100644
--- a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
+++ b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
@@ -129,7 +129,7 @@ def clear_working_tree
 
       # Applies the stash to the working tree to restore the user's state.
       def restore_working_tree
-        result = Overcommit::Utils.execute(%w[git stash pop --index --quiet])
+        result = Overcommit::Utils.execute(%w[git stash pop --index])
         unless result.success?
           raise Overcommit::Exceptions::HookCleanupFailed,
                 "Unable to restore working tree after #{hook_script_name} hooks run:" \

From ba22bb08e7bcdaefd2f90c3e021cd0f251648430 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 31 May 2021 09:19:30 -0700
Subject: [PATCH 162/223] Update change log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51a15ccb..724a1bc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * Update `YamlLint` to `fail` the run instead of `warn` when errors are detected.
 * Update `YamlLint` parse the line number of output so it is line aware.
 * Gracefully handle breaking behavior in upstream Psych gem to support YAML aliases.
+* Fix case where `git` would delete all tracked files when popping stash.
 
 ## 0.57.0
 

From 54b61f92696c0980508944d2224b794e50fc6203 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 31 May 2021 09:24:38 -0700
Subject: [PATCH 163/223] Cut version 0.58.0

---
 CHANGELOG.md              | 2 +-
 lib/overcommit/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 724a1bc4..8833f4b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.58.0
 
 * Add `rexml` dependency explicitly to support Ruby 3.0.
 * Add `DartAnalyzer` pre-commit hook to analyze Dart files.
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index b13414fe..ec9b0cca 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.57.0'
+  VERSION = '0.58.0'
 end

From 919350b0a15ebbe7f3cfd058f73e5941ee0e881e Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 31 May 2021 09:36:20 -0700
Subject: [PATCH 164/223] Add --disable-pending-cops flag to RuboCop pre-commit
 hook

---
 CHANGELOG.md       | 4 ++++
 config/default.yml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8833f4b9..b81a9bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## master (unreleased)
+
+* Add `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook to ignore non-existent cops.
+
 ## 0.58.0
 
 * Add `rexml` dependency explicitly to support Ruby 3.0.
diff --git a/config/default.yml b/config/default.yml
index bfd91e08..51189348 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -703,7 +703,7 @@ PreCommit:
     enabled: false
     description: 'Analyze with RuboCop'
     required_executable: 'rubocop'
-    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names']
+    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names', '--disable-pending-cops']
     install_command: 'gem install rubocop'
     include:
       - '**/*.gemspec'

From 942969a5d6726bdb3c7d006f6d49d77384c520be Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 31 May 2021 09:57:06 -0700
Subject: [PATCH 165/223] Update RuboCop used in CI from 0.54.0 to 0.82.0

While here, run an auto-correct. Note: RuboCop 1.0 has been released,
but as we haven't seen any fundamental bug reports yet, it seems safe to
only upgrade to 0.82.0 at this time, largely due to the new
`--disable-pending-cops` flag introduced in this version.
---
 .rubocop.yml                                  | 10 ++---
 CHANGELOG.md                                  |  2 +-
 Gemfile                                       |  2 +-
 bin/overcommit                                | 11 +++---
 lib/overcommit/cli.rb                         | 22 +++++------
 lib/overcommit/command_splitter.rb            |  2 +
 lib/overcommit/configuration.rb               |  2 +-
 lib/overcommit/configuration_loader.rb        |  6 +--
 lib/overcommit/git_config.rb                  |  1 +
 lib/overcommit/git_repo.rb                    |  8 ++--
 lib/overcommit/hook/commit_msg/spell_check.rb |  2 +-
 lib/overcommit/hook/commit_msg/text_width.rb  |  2 +-
 lib/overcommit/hook/post_checkout/base.rb     |  1 +
 lib/overcommit/hook/post_commit/git_guilt.rb  |  3 +-
 .../hook/pre_commit/bundle_audit.rb           |  2 +-
 .../hook/pre_commit/chamber_compare.rb        | 10 ++---
 .../hook/pre_commit/chamber_security.rb       |  1 +
 lib/overcommit/hook/pre_commit/coffee_lint.rb |  2 +-
 lib/overcommit/hook/pre_commit/css_lint.rb    |  2 +-
 .../hook/pre_commit/dart_analyzer.rb          |  2 +-
 lib/overcommit/hook/pre_commit/erb_lint.rb    |  2 +-
 lib/overcommit/hook/pre_commit/fasterer.rb    |  2 +-
 lib/overcommit/hook/pre_commit/foodcritic.rb  |  4 +-
 lib/overcommit/hook/pre_commit/hlint.rb       |  2 +-
 lib/overcommit/hook/pre_commit/html_tidy.rb   |  2 +-
 .../hook/pre_commit/java_checkstyle.rb        |  2 +-
 lib/overcommit/hook/pre_commit/js_lint.rb     |  2 +-
 lib/overcommit/hook/pre_commit/jsl.rb         |  2 +-
 lib/overcommit/hook/pre_commit/kt_lint.rb     |  2 +-
 .../hook/pre_commit/license_finder.rb         |  1 +
 .../hook/pre_commit/line_endings.rb           |  5 ++-
 lib/overcommit/hook/pre_commit/nginx_test.rb  |  2 +-
 lib/overcommit/hook/pre_commit/php_cs.rb      |  2 +-
 .../hook/pre_commit/php_cs_fixer.rb           |  2 +-
 lib/overcommit/hook/pre_commit/php_lint.rb    |  2 +-
 lib/overcommit/hook/pre_commit/php_stan.rb    |  2 +-
 lib/overcommit/hook/pre_commit/puppet_lint.rb |  2 +-
 .../pre_commit/puppet_metadata_json_lint.rb   |  2 +-
 lib/overcommit/hook/pre_commit/pyflakes.rb    |  2 +-
 lib/overcommit/hook/pre_commit/pylint.rb      |  2 +-
 .../hook/pre_commit/python_flake8.rb          |  2 +-
 .../hook/pre_commit/rails_best_practices.rb   |  2 +-
 .../pre_commit/rails_schema_up_to_date.rb     |  4 +-
 lib/overcommit/hook/pre_commit/rst_lint.rb    |  2 +-
 lib/overcommit/hook/pre_commit/scalariform.rb |  2 +-
 lib/overcommit/hook/pre_commit/scalastyle.rb  |  2 +-
 lib/overcommit/hook/pre_commit/scss_lint.rb   |  6 +--
 .../hook/pre_commit/semi_standard.rb          |  2 +-
 lib/overcommit/hook/pre_commit/sqlint.rb      |  2 +-
 lib/overcommit/hook/pre_commit/standard.rb    |  2 +-
 lib/overcommit/hook/pre_commit/stylelint.rb   |  3 +-
 lib/overcommit/hook/pre_commit/swift_lint.rb  |  2 +-
 lib/overcommit/hook/pre_commit/ts_lint.rb     |  8 ++--
 lib/overcommit/hook/pre_commit/w3c_css.rb     |  8 ++--
 lib/overcommit/hook/pre_commit/w3c_html.rb    |  8 ++--
 lib/overcommit/hook/pre_commit/xml_lint.rb    |  2 +-
 lib/overcommit/hook/pre_commit/yaml_lint.rb   |  2 +-
 .../hook/pre_commit/yard_coverage.rb          |  1 -
 lib/overcommit/hook/pre_push/cargo_test.rb    |  1 +
 .../hook/prepare_commit_msg/base.rb           |  1 +
 .../hook/prepare_commit_msg/replace_branch.rb |  2 +-
 lib/overcommit/hook/shared/bower_install.rb   |  1 +
 lib/overcommit/hook/shared/bundle_install.rb  |  1 +
 .../hook/shared/composer_install.rb           |  1 +
 lib/overcommit/hook/shared/npm_install.rb     |  1 +
 lib/overcommit/hook/shared/yarn_install.rb    |  1 +
 lib/overcommit/hook_context.rb                |  6 +--
 .../helpers/file_modifications.rb             |  1 +
 .../helpers/stash_unstaged_changes.rb         |  3 ++
 lib/overcommit/hook_context/post_commit.rb    |  1 +
 lib/overcommit/hook_context/pre_push.rb       |  1 +
 lib/overcommit/hook_context/run_all.rb        |  1 +
 lib/overcommit/hook_loader/base.rb            |  6 +--
 .../hook_loader/plugin_hook_loader.rb         |  6 +--
 lib/overcommit/hook_runner.rb                 | 15 ++++----
 lib/overcommit/hook_signer.rb                 |  1 +
 lib/overcommit/installer.rb                   |  3 +-
 lib/overcommit/subprocess.rb                  |  2 +-
 lib/overcommit/utils/messages_utils.rb        |  1 +
 spec/overcommit/git_repo_spec.rb              |  2 +-
 .../hook/commit_msg/message_format_spec.rb    | 20 +++++-----
 .../hook/commit_msg/text_width_spec.rb        | 14 +++----
 .../hook/pre_commit/author_email_spec.rb      | 10 ++---
 .../hook/pre_commit/bundle_audit_spec.rb      |  4 +-
 .../hook/pre_commit/bundle_outdated_spec.rb   |  4 +-
 .../hook/pre_commit/erb_lint_spec.rb          |  2 +-
 .../hook/pre_commit/fasterer_spec.rb          |  4 +-
 spec/overcommit/hook/pre_commit/flay_spec.rb  |  4 +-
 .../hook/pre_commit/hadolint_spec.rb          |  6 +--
 .../hook/pre_commit/rake_target_spec.rb       | 10 ++---
 .../hook/pre_commit/yaml_lint_spec.rb         |  6 +--
 .../hook/pre_commit/yard_coverage_spec.rb     |  2 +-
 .../hook/pre_push/rake_target_spec.rb         | 10 ++---
 spec/spec_helper.rb                           |  2 +-
 spec/support/shell_helpers.rb                 |  1 +
 template-dir/hooks/commit-msg                 | 38 +++++++++----------
 template-dir/hooks/overcommit-hook            | 38 +++++++++----------
 template-dir/hooks/post-checkout              | 38 +++++++++----------
 template-dir/hooks/post-commit                | 38 +++++++++----------
 template-dir/hooks/post-merge                 | 38 +++++++++----------
 template-dir/hooks/post-rewrite               | 38 +++++++++----------
 template-dir/hooks/pre-commit                 | 38 +++++++++----------
 template-dir/hooks/pre-push                   | 38 +++++++++----------
 template-dir/hooks/pre-rebase                 | 38 +++++++++----------
 template-dir/hooks/prepare-commit-msg         | 38 +++++++++----------
 105 files changed, 382 insertions(+), 352 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 56197f7d..35002594 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -14,12 +14,15 @@ Layout/EndOfLine:
 Layout/FirstParameterIndentation:
   Enabled: false
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Enabled: false
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 
+Layout/LineLength:
+  Max: 100
+
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
@@ -48,9 +51,6 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 100
-
 Metrics/MethodLength:
   Max: 20
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b81a9bf3..f27e6208 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## master (unreleased)
 
-* Add `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook to ignore non-existent cops.
+* Add `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook to ignore non-existent cops. Requires RuboCop `0.82.0` or newer.
 
 ## 0.58.0
 
diff --git a/Gemfile b/Gemfile
index 961e5d5a..d1cd3c37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,6 @@ gem 'rspec', '~> 3.0'
 gem 'coveralls', '~> 0.8'
 
 # Pin RuboCop for Travis builds.
-gem 'rubocop', '0.54.0'
+gem 'rubocop', '0.82.0'
 
 gem 'ffi' if Gem.win_platform?
diff --git a/bin/overcommit b/bin/overcommit
index ebcf56a4..d54d179f 100755
--- a/bin/overcommit
+++ b/bin/overcommit
@@ -18,15 +18,16 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
     ensure
       $stderr = old_stderr
     end
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
-  rescue Gem::LoadError => ex
+  rescue Gem::LoadError => e
     # Handle case where user is executing overcommit without `bundle exec` and
     # whose local Gemfile has a gem requirement that does not match a gem
     # requirement of the installed version of Overcommit.
-    raise unless ex.message =~ /already activated/i
+    raise unless e.message =~ /already activated/i
+
     exec('bundle', 'exec', $0, *ARGV)
   end
 end
diff --git a/lib/overcommit/cli.rb b/lib/overcommit/cli.rb
index 54a3f9b7..9848c646 100644
--- a/lib/overcommit/cli.rb
+++ b/lib/overcommit/cli.rb
@@ -6,7 +6,7 @@
 module Overcommit
   # Responsible for parsing command-line options and executing appropriate
   # application logic based on those options.
-  class CLI # rubocop:disable ClassLength
+  class CLI # rubocop:disable Metrics/ClassLength
     def initialize(arguments, input, logger)
       @arguments = arguments
       @input     = input
@@ -29,11 +29,11 @@ def run
       when :run_all
         run_all
       end
-    rescue Overcommit::Exceptions::ConfigurationSignatureChanged => ex
-      puts ex
+    rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+      puts e
       exit 78 # EX_CONFIG
-    rescue Overcommit::Exceptions::HookContextLoadError => ex
-      puts ex
+    rescue Overcommit::Exceptions::HookContextLoadError => e
+      puts e
       exit 64 # EX_USAGE
     end
 
@@ -52,8 +52,8 @@ def parse_arguments
 
         # Unconsumed arguments are our targets
         @options[:targets] = @arguments
-      rescue OptionParser::InvalidOption => ex
-        print_help @parser.help, ex
+      rescue OptionParser::InvalidOption => e
+        print_help @parser.help, e
       end
     end
 
@@ -125,11 +125,11 @@ def install_or_uninstall
       @options[:targets].each do |target|
         begin
           Installer.new(log).run(target, @options)
-        rescue Overcommit::Exceptions::InvalidGitRepo => error
-          log.warning "Invalid repo #{target}: #{error}"
+        rescue Overcommit::Exceptions::InvalidGitRepo => e
+          log.warning "Invalid repo #{target}: #{e}"
           halt 69 # EX_UNAVAILABLE
-        rescue Overcommit::Exceptions::PreExistingHooks => error
-          log.warning "Unable to install into #{target}: #{error}"
+        rescue Overcommit::Exceptions::PreExistingHooks => e
+          log.warning "Unable to install into #{target}: #{e}"
           halt 73 # EX_CANTCREAT
         end
       end
diff --git a/lib/overcommit/command_splitter.rb b/lib/overcommit/command_splitter.rb
index 32c5299c..c334b6f9 100644
--- a/lib/overcommit/command_splitter.rb
+++ b/lib/overcommit/command_splitter.rb
@@ -107,8 +107,10 @@ def arguments_under_limit(splittable_args, start_index, byte_limit)
 
         loop do
           break if index > splittable_args.length - 1
+
           total_bytes += splittable_args[index].bytesize
           break if total_bytes > byte_limit # Not enough room
+
           index += 1
         end
 
diff --git a/lib/overcommit/configuration.rb b/lib/overcommit/configuration.rb
index ae3efa50..72086457 100644
--- a/lib/overcommit/configuration.rb
+++ b/lib/overcommit/configuration.rb
@@ -5,7 +5,7 @@
 
 module Overcommit
   # Stores configuration for Overcommit and the hooks it runs.
-  class Configuration # rubocop:disable ClassLength
+  class Configuration # rubocop:disable Metrics/ClassLength
     # Creates a configuration from the given hash.
     #
     # @param hash [Hash] loaded YAML config file as a hash
diff --git a/lib/overcommit/configuration_loader.rb b/lib/overcommit/configuration_loader.rb
index 9ba96fb5..77a08549 100644
--- a/lib/overcommit/configuration_loader.rb
+++ b/lib/overcommit/configuration_loader.rb
@@ -75,10 +75,10 @@ def load_file(file)
       config
     rescue Overcommit::Exceptions::ConfigurationSignatureChanged
       raise
-    rescue StandardError => error
+    rescue StandardError => e
       raise Overcommit::Exceptions::ConfigurationError,
-            "Unable to load configuration from '#{file}': #{error}",
-            error.backtrace
+            "Unable to load configuration from '#{file}': #{e}",
+            e.backtrace
     end
 
     private
diff --git a/lib/overcommit/git_config.rb b/lib/overcommit/git_config.rb
index d2ad2ad6..392dd9da 100644
--- a/lib/overcommit/git_config.rb
+++ b/lib/overcommit/git_config.rb
@@ -16,6 +16,7 @@ def comment_character
     def hooks_path
       path = `git config --get core.hooksPath`.chomp
       return File.join(Overcommit::Utils.git_dir, 'hooks') if path.empty?
+
       File.absolute_path(path, Dir.pwd)
     end
   end
diff --git a/lib/overcommit/git_repo.rb b/lib/overcommit/git_repo.rb
index 179aebaa..1af73e81 100644
--- a/lib/overcommit/git_repo.rb
+++ b/lib/overcommit/git_repo.rb
@@ -14,7 +14,7 @@ module GitRepo
       [^\s]+\s           # Ignore old file range
       \+(\d+)(?:,(\d+))? # Extract range of hunk containing start line and number of lines
       \s@@.*$
-    /x
+    /x.freeze
 
     # Regular expression used to extract information from lines of
     # `git submodule status` output
@@ -22,7 +22,7 @@ module GitRepo
       ^\s*(?<prefix>[-+U]?)(?<sha1>\w+)
       \s(?<path>[^\s]+?)
       (?:\s\((?<describe>.+)\))?$
-    /x
+    /x.freeze
 
     # Struct encapsulating submodule information extracted from the
     # output of `git submodule status`
@@ -262,9 +262,9 @@ def submodules(options = {})
       end
 
       modules
-    rescue IniParse::IniParseError => ex
+    rescue IniParse::IniParseError => e
       raise Overcommit::Exceptions::GitSubmoduleError,
-            "Unable to read submodule information from #{ref}:.gitmodules file: #{ex.message}"
+            "Unable to read submodule information from #{ref}:.gitmodules file: #{e.message}"
     end
 
     # Returns the names of all branches containing the given commit.
diff --git a/lib/overcommit/hook/commit_msg/spell_check.rb b/lib/overcommit/hook/commit_msg/spell_check.rb
index 241df378..ec6c4d4a 100644
--- a/lib/overcommit/hook/commit_msg/spell_check.rb
+++ b/lib/overcommit/hook/commit_msg/spell_check.rb
@@ -9,7 +9,7 @@ module Overcommit::Hook::CommitMsg
   class SpellCheck < Base
     Misspelling = Struct.new(:word, :suggestions)
 
-    MISSPELLING_REGEX = /^[&#]\s(?<word>\w+)(?:.+?:\s(?<suggestions>.*))?/
+    MISSPELLING_REGEX = /^[&#]\s(?<word>\w+)(?:.+?:\s(?<suggestions>.*))?/.freeze
 
     def run
       result = execute(command + [uncommented_commit_msg_file])
diff --git a/lib/overcommit/hook/commit_msg/text_width.rb b/lib/overcommit/hook/commit_msg/text_width.rb
index 011e7e2a..63addbcf 100644
--- a/lib/overcommit/hook/commit_msg/text_width.rb
+++ b/lib/overcommit/hook/commit_msg/text_width.rb
@@ -32,7 +32,7 @@ def find_errors_in_subject(subject)
       min_subject_width = config['min_subject_width']
       if subject.length < min_subject_width
         @errors << "Commit message subject must be >= #{min_subject_width} characters"
-        return
+        nil
       end
     end
 
diff --git a/lib/overcommit/hook/post_checkout/base.rb b/lib/overcommit/hook/post_checkout/base.rb
index 842e3154..78798b9e 100644
--- a/lib/overcommit/hook/post_checkout/base.rb
+++ b/lib/overcommit/hook/post_checkout/base.rb
@@ -16,6 +16,7 @@ def skip_file_checkout?
 
     def enabled?
       return false if file_checkout? && skip_file_checkout?
+
       super
     end
   end
diff --git a/lib/overcommit/hook/post_commit/git_guilt.rb b/lib/overcommit/hook/post_commit/git_guilt.rb
index 41980425..b4f1ead8 100644
--- a/lib/overcommit/hook/post_commit/git_guilt.rb
+++ b/lib/overcommit/hook/post_commit/git_guilt.rb
@@ -5,12 +5,13 @@ module Overcommit::Hook::PostCommit
   #
   # @see https://www.npmjs.com/package/git-guilt
   class GitGuilt < Base
-    PLUS_MINUS_REGEX = /^(.*?)(?:(\++)|(-+))$/
+    PLUS_MINUS_REGEX = /^(.*?)(?:(\++)|(-+))$/.freeze
     GREEN = 32
     RED = 31
 
     def run
       return :pass if initial_commit?
+
       result = execute(command)
       return :fail, result.stderr unless result.success?
 
diff --git a/lib/overcommit/hook/pre_commit/bundle_audit.rb b/lib/overcommit/hook/pre_commit/bundle_audit.rb
index 465cc3c8..1f9f24c7 100644
--- a/lib/overcommit/hook/pre_commit/bundle_audit.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_audit.rb
@@ -17,7 +17,7 @@ def run
       if result.success?
         :pass
       else
-        return [:warn, result.stdout]
+        [:warn, result.stdout]
       end
     end
   end
diff --git a/lib/overcommit/hook/pre_commit/chamber_compare.rb b/lib/overcommit/hook/pre_commit/chamber_compare.rb
index f0c4f146..b3e0366c 100644
--- a/lib/overcommit/hook/pre_commit/chamber_compare.rb
+++ b/lib/overcommit/hook/pre_commit/chamber_compare.rb
@@ -14,11 +14,11 @@ def run
         next unless second
 
         result = execute(
-                   command,
-                   args: [
-                           "--first=#{first.join(' ')}",
-                           "--second=#{second.join(' ')}",
-                         ],
+          command,
+          args: [
+                  "--first=#{first.join(' ')}",
+                  "--second=#{second.join(' ')}",
+                ],
                  )
 
         unless result.stdout.empty?
diff --git a/lib/overcommit/hook/pre_commit/chamber_security.rb b/lib/overcommit/hook/pre_commit/chamber_security.rb
index b47672df..c639fbf8 100644
--- a/lib/overcommit/hook/pre_commit/chamber_security.rb
+++ b/lib/overcommit/hook/pre_commit/chamber_security.rb
@@ -9,6 +9,7 @@ def run
       result = execute(command, args: applicable_files)
 
       return :pass if result.stdout.empty?
+
       [:fail, "These settings appear to need to be secured but were not: #{result.stdout}"]
     end
   end
diff --git a/lib/overcommit/hook/pre_commit/coffee_lint.rb b/lib/overcommit/hook/pre_commit/coffee_lint.rb
index 7e68b40d..57c80a58 100644
--- a/lib/overcommit/hook/pre_commit/coffee_lint.rb
+++ b/lib/overcommit/hook/pre_commit/coffee_lint.rb
@@ -10,7 +10,7 @@ class CoffeeLint < Base
       ,(?<line>\d*),\d*
       ,(?<type>\w+)
       ,(?<msg>.+)$
-    /x
+    /x.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('w') ? :warning : :error
diff --git a/lib/overcommit/hook/pre_commit/css_lint.rb b/lib/overcommit/hook/pre_commit/css_lint.rb
index 7ca82283..b110d074 100644
--- a/lib/overcommit/hook/pre_commit/css_lint.rb
+++ b/lib/overcommit/hook/pre_commit/css_lint.rb
@@ -9,7 +9,7 @@ class CssLint < Base
       ^(?<file>(?:\w:)?[^:]+):\s
       (?:line\s(?<line>\d+)[^EW]+)?
       (?<type>Error|Warning)
-    /x
+    /x.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/dart_analyzer.rb b/lib/overcommit/hook/pre_commit/dart_analyzer.rb
index a1c99448..38002f22 100644
--- a/lib/overcommit/hook/pre_commit/dart_analyzer.rb
+++ b/lib/overcommit/hook/pre_commit/dart_analyzer.rb
@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # Runs `dartanalyzer` against modified Dart files.
   # @see https://dart.dev/tools/dartanalyzer
   class DartAnalyzer < Base
-    MESSAGE_REGEX = /(?<type>.*)•\ (?<message>[^•]+)•\ (?<file>[^:]+):(?<line>\d+):(\d+)\.*/
+    MESSAGE_REGEX = /(?<type>.*)•\ (?<message>[^•]+)•\ (?<file>[^:]+):(?<line>\d+):(\d+)\.*/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/erb_lint.rb b/lib/overcommit/hook/pre_commit/erb_lint.rb
index 2073538c..a903b10b 100644
--- a/lib/overcommit/hook/pre_commit/erb_lint.rb
+++ b/lib/overcommit/hook/pre_commit/erb_lint.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/Shopify/erb-lint
   class ErbLint < Base
-    MESSAGE_REGEX = /(?<message>.+)\nIn file: (?<file>.+):(?<line>\d+)/
+    MESSAGE_REGEX = /(?<message>.+)\nIn file: (?<file>.+):(?<line>\d+)/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/fasterer.rb b/lib/overcommit/hook/pre_commit/fasterer.rb
index dc584368..871be80f 100644
--- a/lib/overcommit/hook/pre_commit/fasterer.rb
+++ b/lib/overcommit/hook/pre_commit/fasterer.rb
@@ -12,7 +12,7 @@ def run
       if extract_offense_num(output) == 0
         :pass
       else
-        return [:warn, output]
+        [:warn, output]
       end
     end
 
diff --git a/lib/overcommit/hook/pre_commit/foodcritic.rb b/lib/overcommit/hook/pre_commit/foodcritic.rb
index 98ac9873..b40adfbe 100644
--- a/lib/overcommit/hook/pre_commit/foodcritic.rb
+++ b/lib/overcommit/hook/pre_commit/foodcritic.rb
@@ -102,7 +102,7 @@ def run
       if result.success?
         :pass
       else
-        return [:warn, result.stderr + result.stdout]
+        [:warn, result.stderr + result.stdout]
       end
     end
 
@@ -137,12 +137,14 @@ def modified_cookbooks_args
 
     def modified(type)
       return [] if !config["#{type}_directory"] || config["#{type}_directory"].empty?
+
       @modified ||= {}
       @modified[type] ||= directories_changed(full_directory_path("#{type}_directory"))
     end
 
     def full_directory_path(config_option)
       return config[config_option] if config[config_option].start_with?(File::SEPARATOR)
+
       File.absolute_path(File.join(Overcommit::Utils.repo_root, config[config_option]))
     end
   end
diff --git a/lib/overcommit/hook/pre_commit/hlint.rb b/lib/overcommit/hook/pre_commit/hlint.rb
index 1ac2775c..a52d1b62 100644
--- a/lib/overcommit/hook/pre_commit/hlint.rb
+++ b/lib/overcommit/hook/pre_commit/hlint.rb
@@ -10,7 +10,7 @@ class Hlint < Base
       :(?<line>\d+)
       :\d+
       :\s*(?<type>\w+)
-    /x
+    /x.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error
diff --git a/lib/overcommit/hook/pre_commit/html_tidy.rb b/lib/overcommit/hook/pre_commit/html_tidy.rb
index b4a2d89d..2667e2c1 100644
--- a/lib/overcommit/hook/pre_commit/html_tidy.rb
+++ b/lib/overcommit/hook/pre_commit/html_tidy.rb
@@ -10,7 +10,7 @@ class HtmlTidy < Base
       line\s(?<line>\d+)\s
       column\s(?<col>\d+)\s-\s
       (?<type>Error|Warning):\s(?<message>.+)$
-    /x
+    /x.freeze
 
     def run
       # example message:
diff --git a/lib/overcommit/hook/pre_commit/java_checkstyle.rb b/lib/overcommit/hook/pre_commit/java_checkstyle.rb
index 4961eb12..5d627a64 100644
--- a/lib/overcommit/hook/pre_commit/java_checkstyle.rb
+++ b/lib/overcommit/hook/pre_commit/java_checkstyle.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://checkstyle.sourceforge.net/
   class JavaCheckstyle < Base
-    MESSAGE_REGEX = /^(\[(?<type>[^\]]+)\]\s+)?(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+    MESSAGE_REGEX = /^(\[(?<type>[^\]]+)\]\s+)?(?<file>(?:\w:)?[^:]+):(?<line>\d+)/.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       %w[WARN INFO].include?(type.to_s) ? :warning : :error
diff --git a/lib/overcommit/hook/pre_commit/js_lint.rb b/lib/overcommit/hook/pre_commit/js_lint.rb
index 3b6b8b87..956dfd2c 100644
--- a/lib/overcommit/hook/pre_commit/js_lint.rb
+++ b/lib/overcommit/hook/pre_commit/js_lint.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://www.jslint.com/
   class JsLint < Base
-    MESSAGE_REGEX = /(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+    MESSAGE_REGEX = /(?<file>(?:\w:)?[^:]+):(?<line>\d+)/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/jsl.rb b/lib/overcommit/hook/pre_commit/jsl.rb
index 38f8a0cf..98eb7175 100644
--- a/lib/overcommit/hook/pre_commit/jsl.rb
+++ b/lib/overcommit/hook/pre_commit/jsl.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://www.javascriptlint.com/
   class Jsl < Base
-    MESSAGE_REGEX = /(?<file>(?:\w:)?.+)\((?<line>\d+)\):(?<type>[^:]+)/
+    MESSAGE_REGEX = /(?<file>(?:\w:)?.+)\((?<line>\d+)\):(?<type>[^:]+)/.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.match?(/warning/) ? :warning : :error
diff --git a/lib/overcommit/hook/pre_commit/kt_lint.rb b/lib/overcommit/hook/pre_commit/kt_lint.rb
index 8e80a581..4b81ed21 100644
--- a/lib/overcommit/hook/pre_commit/kt_lint.rb
+++ b/lib/overcommit/hook/pre_commit/kt_lint.rb
@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # Runs `ktlint` against modified Kotlin files.
   # @see https://github.com/shyiko/ktlint
   class KtLint < Base
-    MESSAGE_REGEX = /((?<file>[^:]+):(?<line>\d+):(\d+):(?<message>.+))/
+    MESSAGE_REGEX = /((?<file>[^:]+):(?<line>\d+):(\d+):(?<message>.+))/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/license_finder.rb b/lib/overcommit/hook/pre_commit/license_finder.rb
index fc3739fe..e2b8611b 100644
--- a/lib/overcommit/hook/pre_commit/license_finder.rb
+++ b/lib/overcommit/hook/pre_commit/license_finder.rb
@@ -7,6 +7,7 @@ class LicenseFinder < Base
     def run
       result = execute(command)
       return :pass if result.success?
+
       output = result.stdout + result.stderr
       [:fail, output]
     end
diff --git a/lib/overcommit/hook/pre_commit/line_endings.rb b/lib/overcommit/hook/pre_commit/line_endings.rb
index 8f8eb9c7..ab66001b 100644
--- a/lib/overcommit/hook/pre_commit/line_endings.rb
+++ b/lib/overcommit/hook/pre_commit/line_endings.rb
@@ -12,14 +12,14 @@ def run
         file = File.open(file_name)
         begin
           messages += check_file(file, file_name)
-        rescue ArgumentError => ex
+        rescue ArgumentError => e
           # File is likely a binary file which this check should ignore, but
           # print a warning just in case
           messages << Overcommit::Hook::Message.new(
             :warning,
             file_name,
             file.lineno,
-            "#{file_name}:#{file.lineno}:#{ex.message}"
+            "#{file_name}:#{file.lineno}:#{e.message}"
           )
         end
       end
@@ -59,6 +59,7 @@ def offending_files
         i = info.split.first
         next if i == 'l/-text' # ignore binary files
         next if i == "l/#{eol}"
+
         path
       end.compact
     end
diff --git a/lib/overcommit/hook/pre_commit/nginx_test.rb b/lib/overcommit/hook/pre_commit/nginx_test.rb
index cff43bbe..b681ded0 100644
--- a/lib/overcommit/hook/pre_commit/nginx_test.rb
+++ b/lib/overcommit/hook/pre_commit/nginx_test.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://www.nginx.com/resources/wiki/start/topics/tutorials/commandline/
   class NginxTest < Base
-    MESSAGE_REGEX = /^nginx: .+ in (?<file>.+):(?<line>\d+)$/
+    MESSAGE_REGEX = /^nginx: .+ in (?<file>.+):(?<line>\d+)$/.freeze
 
     def run
       messages = []
diff --git a/lib/overcommit/hook/pre_commit/php_cs.rb b/lib/overcommit/hook/pre_commit/php_cs.rb
index 8e837406..41d2f2b4 100644
--- a/lib/overcommit/hook/pre_commit/php_cs.rb
+++ b/lib/overcommit/hook/pre_commit/php_cs.rb
@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # Runs `phpcs` against any modified PHP files.
   class PhpCs < Base
     # Parse `phpcs` csv mode output
-    MESSAGE_REGEX = /^\"(?<file>.+)\",(?<line>\d+),\d+,(?<type>.+),\"(?<msg>.+)\"/
+    MESSAGE_REGEX = /^\"(?<file>.+)\",(?<line>\d+),\d+,(?<type>.+),\"(?<msg>.+)\"/.freeze
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       'error'.include?(type) ? :error : :warning
     end
diff --git a/lib/overcommit/hook/pre_commit/php_cs_fixer.rb b/lib/overcommit/hook/pre_commit/php_cs_fixer.rb
index 02f8932e..87e63744 100644
--- a/lib/overcommit/hook/pre_commit/php_cs_fixer.rb
+++ b/lib/overcommit/hook/pre_commit/php_cs_fixer.rb
@@ -3,7 +3,7 @@
 module Overcommit::Hook::PreCommit
   # Runs `php-cs-fixer` against any modified PHP files.
   class PhpCsFixer < Base
-    MESSAGE_REGEX = /\s+\d+\)\s+(?<file>.*\.php)(?<violated_rules>\s+\(\w+(?:,\s+)?\))?/
+    MESSAGE_REGEX = /\s+\d+\)\s+(?<file>.*\.php)(?<violated_rules>\s+\(\w+(?:,\s+)?\))?/.freeze
 
     def run
       messages = []
diff --git a/lib/overcommit/hook/pre_commit/php_lint.rb b/lib/overcommit/hook/pre_commit/php_lint.rb
index 98582c3c..3f70bfb2 100644
--- a/lib/overcommit/hook/pre_commit/php_lint.rb
+++ b/lib/overcommit/hook/pre_commit/php_lint.rb
@@ -7,7 +7,7 @@ class PhpLint < Base
     # rubocop:disable Metrics/LineLength
     #   PHP Parse error:  syntax error, unexpected 'require_once' (T_REQUIRE_ONCE) in site/sumo.php on line 12
     # rubocop:enable Metrics/LineLength
-    MESSAGE_REGEX = /^(?<type>.+)\:\s+(?<message>.+) in (?<file>.+) on line (?<line>\d+)/
+    MESSAGE_REGEX = /^(?<type>.+)\:\s+(?<message>.+) in (?<file>.+) on line (?<line>\d+)/.freeze
 
     def run
       # A list of error messages
diff --git a/lib/overcommit/hook/pre_commit/php_stan.rb b/lib/overcommit/hook/pre_commit/php_stan.rb
index d9971ff0..9b8550f7 100644
--- a/lib/overcommit/hook/pre_commit/php_stan.rb
+++ b/lib/overcommit/hook/pre_commit/php_stan.rb
@@ -8,7 +8,7 @@ module Overcommit::Hook::PreCommit
   # https://github.com/phpstan/phpstan/issues/239
   # https://gist.github.com/edmondscommerce/89695c9cd2584fefdf540fb1c528d2c2
   class PhpStan < Base
-    MESSAGE_REGEX = /^(?<file>.+)\:(?<line>\d+)\:(?<message>.+)/
+    MESSAGE_REGEX = /^(?<file>.+)\:(?<line>\d+)\:(?<message>.+)/.freeze
 
     def run
       messages = []
diff --git a/lib/overcommit/hook/pre_commit/puppet_lint.rb b/lib/overcommit/hook/pre_commit/puppet_lint.rb
index c67c248a..2ddf3a10 100644
--- a/lib/overcommit/hook/pre_commit/puppet_lint.rb
+++ b/lib/overcommit/hook/pre_commit/puppet_lint.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://puppet-lint.com/
   class PuppetLint < Base
-    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/
+    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type == 'ERROR' ? :error : :warning
diff --git a/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb b/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb
index b020b79c..311a09c3 100644
--- a/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb
+++ b/lib/overcommit/hook/pre_commit/puppet_metadata_json_lint.rb
@@ -8,7 +8,7 @@ module Overcommit::Hook::PreCommit
   # @see https://voxpupuli.org/blog/2014/11/06/linting-metadata-json/
   #
   class PuppetMetadataJsonLint < Base
-    MESSAGE_REGEX = /\((?<type>.*)\).*/
+    MESSAGE_REGEX = /\((?<type>.*)\).*/.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type == 'WARN' ? :warning : :error
diff --git a/lib/overcommit/hook/pre_commit/pyflakes.rb b/lib/overcommit/hook/pre_commit/pyflakes.rb
index 871f0594..ff7824c4 100644
--- a/lib/overcommit/hook/pre_commit/pyflakes.rb
+++ b/lib/overcommit/hook/pre_commit/pyflakes.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://pypi.python.org/pypi/pyflakes
   class Pyflakes < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/pylint.rb b/lib/overcommit/hook/pre_commit/pylint.rb
index 1ee92c9a..526bee2d 100644
--- a/lib/overcommit/hook/pre_commit/pylint.rb
+++ b/lib/overcommit/hook/pre_commit/pylint.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://www.pylint.org/
   class Pylint < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?.+):(?<line>\d+):(?<type>[CEFRW])/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?.+):(?<line>\d+):(?<type>[CEFRW])/.freeze
 
     # Classify 'E' and 'F' message codes as errors,
     # everything else as warnings.
diff --git a/lib/overcommit/hook/pre_commit/python_flake8.rb b/lib/overcommit/hook/pre_commit/python_flake8.rb
index 0e03bdf9..d506cf62 100644
--- a/lib/overcommit/hook/pre_commit/python_flake8.rb
+++ b/lib/overcommit/hook/pre_commit/python_flake8.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://pypi.python.org/pypi/flake8
   class PythonFlake8 < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?.+):(?<line>\d+):\d+:\s(?<type>\w\d+)/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?.+):(?<line>\d+):\d+:\s(?<type>\w\d+)/.freeze
 
     # Classify 'Exxx' and 'Fxxx' message codes as errors,
     # everything else as warnings.
diff --git a/lib/overcommit/hook/pre_commit/rails_best_practices.rb b/lib/overcommit/hook/pre_commit/rails_best_practices.rb
index bda0101f..7c3ba79a 100644
--- a/lib/overcommit/hook/pre_commit/rails_best_practices.rb
+++ b/lib/overcommit/hook/pre_commit/rails_best_practices.rb
@@ -7,7 +7,7 @@ module PreCommit
       #
       # @see https://github.com/railsbp/rails_best_practices
       class RailsBestPractices < Base
-        ERROR_REGEXP = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)\s-\s(?<type>.+)/
+        ERROR_REGEXP = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)\s-\s(?<type>.+)/.freeze
 
         def run
           result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
index da0951bf..13d7932f 100644
--- a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+++ b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   # failure. The exception is if the schema is at version 0 (i.e before any
   # migrations have been run). In this case it is OK if there are no migrations.
   class RailsSchemaUpToDate < Base
-    def run # rubocop:disable CyclomaticComplexity, PerceivedComplexity
+    def run # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       if migration_files.any? && schema_files.none?
         return :fail, "It looks like you're adding a migration, but did not update the schema file"
       elsif migration_files.none? && schema_files.any? && non_zero_schema_version?
@@ -18,7 +18,7 @@ def run # rubocop:disable CyclomaticComplexity, PerceivedComplexity
         # their username.
         latest_version = migration_files.map do |file|
           File.basename(file)[/\d+/]
-        end.sort.last
+        end.max
 
         up_to_date = schema.include?(latest_version)
 
diff --git a/lib/overcommit/hook/pre_commit/rst_lint.rb b/lib/overcommit/hook/pre_commit/rst_lint.rb
index 15f93584..5647508d 100644
--- a/lib/overcommit/hook/pre_commit/rst_lint.rb
+++ b/lib/overcommit/hook/pre_commit/rst_lint.rb
@@ -7,7 +7,7 @@ module Overcommit::Hook::PreCommit
   class RstLint < Base
     MESSAGE_REGEX = /
     ^(?<type>INFO|WARNING|ERROR|SEVERE)(?<file>(?:\w:)?[^:]+):(?<line>\d+)\s(?<msg>.+)
-    /x
+    /x.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/scalariform.rb b/lib/overcommit/hook/pre_commit/scalariform.rb
index 6b766dd0..63bf5e6c 100644
--- a/lib/overcommit/hook/pre_commit/scalariform.rb
+++ b/lib/overcommit/hook/pre_commit/scalariform.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/mdr/scalariform
   class Scalariform < Base
-    MESSAGE_REGEX = /^\[(?<type>FAILED|ERROR)\]\s+(?<file>(?:\w:)?.+)/
+    MESSAGE_REGEX = /^\[(?<type>FAILED|ERROR)\]\s+(?<file>(?:\w:)?.+)/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/scalastyle.rb b/lib/overcommit/hook/pre_commit/scalastyle.rb
index 55c6dc4f..6494521d 100644
--- a/lib/overcommit/hook/pre_commit/scalastyle.rb
+++ b/lib/overcommit/hook/pre_commit/scalastyle.rb
@@ -10,7 +10,7 @@ class Scalastyle < Base
       file=(?<file>(?:\w:)?.+)\s
       message=.+\s*
       (line=(?<line>\d+))?
-    /x
+    /x.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/scss_lint.rb b/lib/overcommit/hook/pre_commit/scss_lint.rb
index 6d279cec..1bbaba93 100644
--- a/lib/overcommit/hook/pre_commit/scss_lint.rb
+++ b/lib/overcommit/hook/pre_commit/scss_lint.rb
@@ -18,9 +18,9 @@ def run
 
       begin
         collect_lint_messages(JSON.parse(result.stdout))
-      rescue JSON::ParserError => ex
-        return :fail, "Unable to parse JSON returned by SCSS-Lint: #{ex.message}\n" \
-                      "STDOUT: #{result.stdout}\nSTDERR: #{result.stderr}"
+      rescue JSON::ParserError => e
+        [:fail, "Unable to parse JSON returned by SCSS-Lint: #{e.message}\n" \
+                      "STDOUT: #{result.stdout}\nSTDERR: #{result.stderr}"]
       end
     end
 
diff --git a/lib/overcommit/hook/pre_commit/semi_standard.rb b/lib/overcommit/hook/pre_commit/semi_standard.rb
index ce40119b..f6746d2f 100644
--- a/lib/overcommit/hook/pre_commit/semi_standard.rb
+++ b/lib/overcommit/hook/pre_commit/semi_standard.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/Flet/semistandard
   class SemiStandard < Base
-    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/sqlint.rb b/lib/overcommit/hook/pre_commit/sqlint.rb
index 6568a987..2e5c5a88 100644
--- a/lib/overcommit/hook/pre_commit/sqlint.rb
+++ b/lib/overcommit/hook/pre_commit/sqlint.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/purcell/sqlint
   class Sqlint < Base
-    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/
+    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type == 'ERROR' ? :error : :warning
diff --git a/lib/overcommit/hook/pre_commit/standard.rb b/lib/overcommit/hook/pre_commit/standard.rb
index 4d2ee277..7b70ab2c 100644
--- a/lib/overcommit/hook/pre_commit/standard.rb
+++ b/lib/overcommit/hook/pre_commit/standard.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/feross/standard
   class Standard < Base
-    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/stylelint.rb b/lib/overcommit/hook/pre_commit/stylelint.rb
index 403c5e27..e20bc8df 100644
--- a/lib/overcommit/hook/pre_commit/stylelint.rb
+++ b/lib/overcommit/hook/pre_commit/stylelint.rb
@@ -8,12 +8,13 @@ class Stylelint < Base
     # example of output:
     # index.css: line 4, col 4, error - Expected indentation of 2 spaces (indentation)
 
-    MESSAGE_REGEX = /^(?<file>.+):\D*(?<line>\d+).*$/
+    MESSAGE_REGEX = /^(?<file>.+):\D*(?<line>\d+).*$/.freeze
 
     def run
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
+
       extract_messages(
         output.split("\n"),
         MESSAGE_REGEX
diff --git a/lib/overcommit/hook/pre_commit/swift_lint.rb b/lib/overcommit/hook/pre_commit/swift_lint.rb
index 40e4a5eb..a1d8ef09 100644
--- a/lib/overcommit/hook/pre_commit/swift_lint.rb
+++ b/lib/overcommit/hook/pre_commit/swift_lint.rb
@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # Runs `swiftlint lint` against modified Swift files.
   # @see https://github.com/realm/SwiftLint
   class SwiftLint < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+):(?<message>.*)/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+):(?<message>.*)/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/ts_lint.rb b/lib/overcommit/hook/pre_commit/ts_lint.rb
index 7f8cc503..1340cbcf 100644
--- a/lib/overcommit/hook/pre_commit/ts_lint.rb
+++ b/lib/overcommit/hook/pre_commit/ts_lint.rb
@@ -8,7 +8,7 @@ class TsLint < Base
     # "src/file/anotherfile.ts[298, 1]: exceeds maximum line length of 140"
     # or
     # "ERROR: src/AccountController.ts[4, 28]: expected call-signature to have a typedef"
-    MESSAGE_REGEX = /^(?<type>.+: )?(?<file>.+?(?=\[))[^\d]+(?<line>\d+).*?/
+    MESSAGE_REGEX = /^(?<type>.+: )?(?<file>.+?(?=\[))[^\d]+(?<line>\d+).*?/.freeze
 
     def run
       result = execute(command, args: applicable_files)
@@ -19,9 +19,9 @@ def run
       type_categorizer = ->(type) { type.nil? || type.include?('ERROR') ? :error : :warning }
 
       extract_messages(
-          output_lines,
-          MESSAGE_REGEX,
-          type_categorizer
+        output_lines,
+        MESSAGE_REGEX,
+        type_categorizer
       )
     end
   end
diff --git a/lib/overcommit/hook/pre_commit/w3c_css.rb b/lib/overcommit/hook/pre_commit/w3c_css.rb
index f36230f6..cb32c109 100644
--- a/lib/overcommit/hook/pre_commit/w3c_css.rb
+++ b/lib/overcommit/hook/pre_commit/w3c_css.rb
@@ -42,10 +42,10 @@ def validator
     def opts
       @opts ||= {
         validator_uri: config['validator_uri'],
-        proxy_server:  config['proxy_server'],
-        proxy_port:    config['proxy_port'],
-        proxy_user:    config['proxy_user'],
-        proxy_pass:    config['proxy_pass']
+        proxy_server: config['proxy_server'],
+        proxy_port: config['proxy_port'],
+        proxy_user: config['proxy_user'],
+        proxy_pass: config['proxy_pass']
       }
     end
 
diff --git a/lib/overcommit/hook/pre_commit/w3c_html.rb b/lib/overcommit/hook/pre_commit/w3c_html.rb
index 5330ef4e..945e7997 100644
--- a/lib/overcommit/hook/pre_commit/w3c_html.rb
+++ b/lib/overcommit/hook/pre_commit/w3c_html.rb
@@ -42,10 +42,10 @@ def validator
     def opts
       @opts ||= {
         validator_uri: config['validator_uri'],
-        proxy_server:  config['proxy_server'],
-        proxy_port:    config['proxy_port'],
-        proxy_user:    config['proxy_user'],
-        proxy_pass:    config['proxy_pass']
+        proxy_server: config['proxy_server'],
+        proxy_port: config['proxy_port'],
+        proxy_user: config['proxy_user'],
+        proxy_pass: config['proxy_pass']
       }
     end
 
diff --git a/lib/overcommit/hook/pre_commit/xml_lint.rb b/lib/overcommit/hook/pre_commit/xml_lint.rb
index 618f3e74..71cb403f 100644
--- a/lib/overcommit/hook/pre_commit/xml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/xml_lint.rb
@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://xmlsoft.org/xmllint.html
   class XmlLint < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/yaml_lint.rb b/lib/overcommit/hook/pre_commit/yaml_lint.rb
index 1fd57513..f780725f 100644
--- a/lib/overcommit/hook/pre_commit/yaml_lint.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_lint.rb
@@ -11,7 +11,7 @@ class YamlLint < Base
       :(?<col>\d+)
       :\s\[(?<type>\w+)\]
       \s(?<msg>.+)$
-    /x
+    /x.freeze
 
     def run
       result = execute(command, args: applicable_files)
diff --git a/lib/overcommit/hook/pre_commit/yard_coverage.rb b/lib/overcommit/hook/pre_commit/yard_coverage.rb
index b9336f0f..c9188edb 100644
--- a/lib/overcommit/hook/pre_commit/yard_coverage.rb
+++ b/lib/overcommit/hook/pre_commit/yard_coverage.rb
@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 module Overcommit::Hook::PreCommit
diff --git a/lib/overcommit/hook/pre_push/cargo_test.rb b/lib/overcommit/hook/pre_push/cargo_test.rb
index 33e5076b..ab782e0c 100644
--- a/lib/overcommit/hook/pre_push/cargo_test.rb
+++ b/lib/overcommit/hook/pre_push/cargo_test.rb
@@ -6,6 +6,7 @@ class CargoTest < Base
     def run
       result = execute(command)
       return :pass if result.success?
+
       [:fail, result.stdout]
     end
   end
diff --git a/lib/overcommit/hook/prepare_commit_msg/base.rb b/lib/overcommit/hook/prepare_commit_msg/base.rb
index 5c0c68d4..a4fbf31e 100644
--- a/lib/overcommit/hook/prepare_commit_msg/base.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/base.rb
@@ -12,6 +12,7 @@ class Base < Overcommit::Hook::Base
 
     def modify_commit_message
       raise 'This expects a block!' unless block_given?
+
       # NOTE: this assumes all the hooks of the same type share the context's
       # memory. If that's not the case, this won't work.
       lock.synchronize do
diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index 5739d124..7a40ed69 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -29,7 +29,7 @@ module Overcommit::Hook::PrepareCommitMsg
   # - 'squash'   - if squashing
   #
   class ReplaceBranch < Base
-    DEFAULT_BRANCH_PATTERN = /\A(\d+)-(\w+).*\z/
+    DEFAULT_BRANCH_PATTERN = /\A(\d+)-(\w+).*\z/.freeze
 
     def run
       return :pass if skip?
diff --git a/lib/overcommit/hook/shared/bower_install.rb b/lib/overcommit/hook/shared/bower_install.rb
index b39d4ada..cfcde92f 100644
--- a/lib/overcommit/hook/shared/bower_install.rb
+++ b/lib/overcommit/hook/shared/bower_install.rb
@@ -9,6 +9,7 @@ module BowerInstall
     def run
       result = execute(command)
       return :fail, result.stderr unless result.success?
+
       :pass
     end
   end
diff --git a/lib/overcommit/hook/shared/bundle_install.rb b/lib/overcommit/hook/shared/bundle_install.rb
index 060e30c5..01acaa32 100644
--- a/lib/overcommit/hook/shared/bundle_install.rb
+++ b/lib/overcommit/hook/shared/bundle_install.rb
@@ -9,6 +9,7 @@ module BundleInstall
     def run
       result = execute(command)
       return :fail, result.stdout unless result.success?
+
       :pass
     end
   end
diff --git a/lib/overcommit/hook/shared/composer_install.rb b/lib/overcommit/hook/shared/composer_install.rb
index 839dd65b..2d2ff01d 100644
--- a/lib/overcommit/hook/shared/composer_install.rb
+++ b/lib/overcommit/hook/shared/composer_install.rb
@@ -9,6 +9,7 @@ module ComposerInstall
     def run
       result = execute(command)
       return :fail, result.stdout unless result.success?
+
       :pass
     end
   end
diff --git a/lib/overcommit/hook/shared/npm_install.rb b/lib/overcommit/hook/shared/npm_install.rb
index 7fa06772..f487c8e7 100644
--- a/lib/overcommit/hook/shared/npm_install.rb
+++ b/lib/overcommit/hook/shared/npm_install.rb
@@ -9,6 +9,7 @@ module NpmInstall
     def run
       result = execute(command)
       return :fail, result.stderr unless result.success?
+
       :pass
     end
   end
diff --git a/lib/overcommit/hook/shared/yarn_install.rb b/lib/overcommit/hook/shared/yarn_install.rb
index bc3b7869..fd548f07 100644
--- a/lib/overcommit/hook/shared/yarn_install.rb
+++ b/lib/overcommit/hook/shared/yarn_install.rb
@@ -9,6 +9,7 @@ module YarnInstall
     def run
       result = execute(command)
       return :fail, result.stderr unless result.success?
+
       :pass
     end
   end
diff --git a/lib/overcommit/hook_context.rb b/lib/overcommit/hook_context.rb
index df12b86c..acdff1bb 100644
--- a/lib/overcommit/hook_context.rb
+++ b/lib/overcommit/hook_context.rb
@@ -9,11 +9,11 @@ def self.create(hook_type, config, args, input)
     require "overcommit/hook_context/#{underscored_hook_type}"
 
     Overcommit::HookContext.const_get(hook_type_class).new(config, args, input)
-  rescue LoadError, NameError => error
+  rescue LoadError, NameError => e
     # Could happen when a symlink was created for a hook type Overcommit does
     # not yet support.
     raise Overcommit::Exceptions::HookContextLoadError,
-          "Unable to load '#{hook_type}' hook context: '#{error}'",
-          error.backtrace
+          "Unable to load '#{hook_type}' hook context: '#{e}'",
+          e.backtrace
   end
 end
diff --git a/lib/overcommit/hook_context/helpers/file_modifications.rb b/lib/overcommit/hook_context/helpers/file_modifications.rb
index 9eade907..00aaccc8 100644
--- a/lib/overcommit/hook_context/helpers/file_modifications.rb
+++ b/lib/overcommit/hook_context/helpers/file_modifications.rb
@@ -11,6 +11,7 @@ def amendment?
 
         cmd = Overcommit::Utils.parent_command
         return unless cmd
+
         amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
 
         # Since the ps command can return invalid byte sequences for commands
diff --git a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
index 0d333098..17400539 100644
--- a/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
+++ b/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb
@@ -26,6 +26,7 @@ def setup_environment
       # Returns whether the current git branch is empty (has no commits).
       def initial_commit?
         return @initial_commit unless @initial_commit.nil?
+
         @initial_commit = Overcommit::GitRepo.initial_commit?
       end
 
@@ -63,6 +64,7 @@ def store_modified_times
         (staged_files + unstaged_files).each do |file|
           next if Overcommit::Utils.broken_symlink?(file)
           next unless File.exist?(file) # Ignore renamed files (old file no longer exists)
+
           @modified_times[file] = File.mtime(file)
         end
       end
@@ -101,6 +103,7 @@ def restore_modified_times
         @modified_times.each do |file, time|
           next if Overcommit::Utils.broken_symlink?(file)
           next unless File.exist?(file)
+
           File.utime(time, time, file)
         end
       end
diff --git a/lib/overcommit/hook_context/post_commit.rb b/lib/overcommit/hook_context/post_commit.rb
index 0e780077..8327b0d9 100644
--- a/lib/overcommit/hook_context/post_commit.rb
+++ b/lib/overcommit/hook_context/post_commit.rb
@@ -27,6 +27,7 @@ def modified_lines_in_file(file)
     # @return [true,false]
     def initial_commit?
       return @initial_commit unless @initial_commit.nil?
+
       @initial_commit = !Overcommit::Utils.execute(%w[git rev-parse HEAD~]).success?
     end
   end
diff --git a/lib/overcommit/hook_context/pre_push.rb b/lib/overcommit/hook_context/pre_push.rb
index 0b2e72a1..39ec19ba 100644
--- a/lib/overcommit/hook_context/pre_push.rb
+++ b/lib/overcommit/hook_context/pre_push.rb
@@ -76,6 +76,7 @@ def ref_range
 
       def overwritten_commits
         return @overwritten_commits if defined? @overwritten_commits
+
         result = Overcommit::Subprocess.spawn(%W[git rev-list #{remote_sha1} ^#{local_sha1}])
         if result.success?
           result.stdout.split("\n")
diff --git a/lib/overcommit/hook_context/run_all.rb b/lib/overcommit/hook_context/run_all.rb
index e7acee57..5ed7efa0 100644
--- a/lib/overcommit/hook_context/run_all.rb
+++ b/lib/overcommit/hook_context/run_all.rb
@@ -36,6 +36,7 @@ def hook_script_name
 
     def initial_commit?
       return @initial_commit unless @initial_commit.nil?
+
       @initial_commit = Overcommit::GitRepo.initial_commit?
     end
 
diff --git a/lib/overcommit/hook_loader/base.rb b/lib/overcommit/hook_loader/base.rb
index 93e83ccc..9173e9f1 100644
--- a/lib/overcommit/hook_loader/base.rb
+++ b/lib/overcommit/hook_loader/base.rb
@@ -38,10 +38,10 @@ def create_hook(hook_name)
         Overcommit::Hook.const_get(@context.hook_class_name).
                          const_get(hook_name).
                          new(@config, @context)
-      rescue LoadError, NameError => error
+      rescue LoadError, NameError => e
         raise Overcommit::Exceptions::HookLoadError,
-              "Unable to load hook '#{hook_name}': #{error}",
-              error.backtrace
+              "Unable to load hook '#{hook_name}': #{e}",
+              e.backtrace
       end
     end
   end
diff --git a/lib/overcommit/hook_loader/plugin_hook_loader.rb b/lib/overcommit/hook_loader/plugin_hook_loader.rb
index b57d7095..d168a0de 100644
--- a/lib/overcommit/hook_loader/plugin_hook_loader.rb
+++ b/lib/overcommit/hook_loader/plugin_hook_loader.rb
@@ -93,10 +93,10 @@ def run
       end
 
       hook_module.const_set(hook_name, hook_class).new(@config, @context)
-    rescue LoadError, NameError => error
+    rescue LoadError, NameError => e
       raise Overcommit::Exceptions::HookLoadError,
-            "Unable to load hook '#{hook_name}': #{error}",
-            error.backtrace
+            "Unable to load hook '#{hook_name}': #{e}",
+            e.backtrace
     end
   end
 end
diff --git a/lib/overcommit/hook_runner.rb b/lib/overcommit/hook_runner.rb
index 8ac01e99..c7c313ab 100644
--- a/lib/overcommit/hook_runner.rb
+++ b/lib/overcommit/hook_runner.rb
@@ -94,6 +94,7 @@ def consume
       loop do
         hook = @lock.synchronize { @hooks_left.pop }
         break unless hook
+
         run_hook(hook)
       end
     end
@@ -159,12 +160,12 @@ def run_hook(hook) # rubocop:disable Metrics/CyclomaticComplexity
         return if should_skip?(hook)
 
         status, output = hook.run_and_transform
-      rescue Overcommit::Exceptions::MessageProcessingError => ex
+      rescue Overcommit::Exceptions::MessageProcessingError => e
         status = :fail
-        output = ex.message
-      rescue StandardError => ex
+        output = e.message
+      rescue StandardError => e
         status = :fail
-        output = "Hook raised unexpected error\n#{ex.message}\n#{ex.backtrace.join("\n")}"
+        output = "Hook raised unexpected error\n#{e.message}\n#{e.backtrace.join("\n")}"
       end
 
       @failed = true if status == :fail
@@ -202,7 +203,7 @@ def load_hooks
 
       # Load plugin hooks after so they can subclass existing hooks
       @hooks += HookLoader::PluginHookLoader.new(@config, @context, @log).load_hooks
-    rescue LoadError => ex
+    rescue LoadError => e
       # Include a more helpful message that will probably save some confusion
       message = 'A load error occurred. ' +
         if @config['gemfile']
@@ -212,8 +213,8 @@ def load_hooks
         end
 
       raise Overcommit::Exceptions::HookLoadError,
-            "#{message}\n#{ex.message}",
-            ex.backtrace
+            "#{message}\n#{e.message}",
+            e.backtrace
     end
   end
 end
diff --git a/lib/overcommit/hook_signer.rb b/lib/overcommit/hook_signer.rb
index f432ca48..fab99c37 100644
--- a/lib/overcommit/hook_signer.rb
+++ b/lib/overcommit/hook_signer.rb
@@ -52,6 +52,7 @@ def hook_path
 
     def signable_file?(file)
       return unless file
+
       sep = Overcommit::OS.windows? ? '\\' : File::SEPARATOR
       file.start_with?(".#{sep}") ||
         file.start_with?(Overcommit::Utils.repo_root)
diff --git a/lib/overcommit/installer.rb b/lib/overcommit/installer.rb
index 11d598e8..79287b30 100644
--- a/lib/overcommit/installer.rb
+++ b/lib/overcommit/installer.rb
@@ -4,7 +4,7 @@
 
 module Overcommit
   # Manages the installation of Overcommit hooks in a git repository.
-  class Installer # rubocop:disable ClassLength
+  class Installer # rubocop:disable Metrics/ClassLength
     TEMPLATE_DIRECTORY = File.join(Overcommit::HOME, 'template-dir')
     MASTER_HOOK = File.join(TEMPLATE_DIRECTORY, 'hooks', 'overcommit-hook')
 
@@ -174,6 +174,7 @@ def install_starter_config
       repo_config_file = File.join(@target, Overcommit::CONFIG_FILE_NAME)
 
       return if File.exist?(repo_config_file)
+
       FileUtils.cp(File.join(Overcommit::HOME, 'config', 'starter.yml'), repo_config_file)
     end
 
diff --git a/lib/overcommit/subprocess.rb b/lib/overcommit/subprocess.rb
index 47713ff2..07e4fe04 100644
--- a/lib/overcommit/subprocess.rb
+++ b/lib/overcommit/subprocess.rb
@@ -38,7 +38,7 @@ def spawn(args, options = {})
         if options[:input]
           begin
             process.io.stdin.puts(options[:input])
-          rescue StandardError # rubocop:disable Lint/HandleExceptions
+          rescue StandardError
             # Silently ignore if the standard input stream of the spawned
             # process is closed before we get a chance to write to it. This
             # happens on JRuby a lot.
diff --git a/lib/overcommit/utils/messages_utils.rb b/lib/overcommit/utils/messages_utils.rb
index 642e3e22..c92a6010 100644
--- a/lib/overcommit/utils/messages_utils.rb
+++ b/lib/overcommit/utils/messages_utils.rb
@@ -52,6 +52,7 @@ def extract_file(match, message)
 
       def extract_line(match, message)
         return unless match.names.include?('line')
+
         Integer(match[:line])
       rescue ArgumentError, TypeError
         raise Overcommit::Exceptions::MessageProcessingError,
diff --git a/spec/overcommit/git_repo_spec.rb b/spec/overcommit/git_repo_spec.rb
index a5f753e1..128737c3 100644
--- a/spec/overcommit/git_repo_spec.rb
+++ b/spec/overcommit/git_repo_spec.rb
@@ -377,7 +377,7 @@
 
       it 'returns all submodules that were removed' do
         subject.size.should == 2
-        subject.map(&:path).sort.should == ['sub-repo', 'yet-another-sub-repo']
+        subject.map(&:path).sort.should == %w[sub-repo yet-another-sub-repo]
       end
     end
   end
diff --git a/spec/overcommit/hook/commit_msg/message_format_spec.rb b/spec/overcommit/hook/commit_msg/message_format_spec.rb
index d4aaab62..c9dde29b 100644
--- a/spec/overcommit/hook/commit_msg/message_format_spec.rb
+++ b/spec/overcommit/hook/commit_msg/message_format_spec.rb
@@ -15,11 +15,11 @@
   context 'when pattern is empty' do
     let(:config) do
       super().merge(Overcommit::Configuration.new(
-        'CommitMsg' => {
-          'MessageFormat' => {
-            'pattern' => nil
-          }
-        }
+                      'CommitMsg' => {
+                        'MessageFormat' => {
+                          'pattern' => nil
+                        }
+                      }
       ))
     end
 
@@ -43,11 +43,11 @@
   context 'when multiline message matches the pattern' do
     let(:config) do
       super().merge(Overcommit::Configuration.new(
-        'CommitMsg' => {
-          'MessageFormat' => {
-            'pattern' => '^Some .* Message$'
-          }
-        }
+                      'CommitMsg' => {
+                        'MessageFormat' => {
+                          'pattern' => '^Some .* Message$'
+                        }
+                      }
       ))
     end
 
diff --git a/spec/overcommit/hook/commit_msg/text_width_spec.rb b/spec/overcommit/hook/commit_msg/text_width_spec.rb
index e07d777e..8829668e 100644
--- a/spec/overcommit/hook/commit_msg/text_width_spec.rb
+++ b/spec/overcommit/hook/commit_msg/text_width_spec.rb
@@ -98,13 +98,13 @@
   context 'when custom lengths are specified' do
     let(:config) do
       super().merge(Overcommit::Configuration.new(
-        'CommitMsg' => {
-          'TextWidth' => {
-            'max_subject_width' => 70,
-            'min_subject_width' => 4,
-            'max_body_width' => 80
-          }
-        }
+                      'CommitMsg' => {
+                        'TextWidth' => {
+                          'max_subject_width' => 70,
+                          'min_subject_width' => 4,
+                          'max_body_width' => 80
+                        }
+                      }
       ))
     end
 
diff --git a/spec/overcommit/hook/pre_commit/author_email_spec.rb b/spec/overcommit/hook/pre_commit/author_email_spec.rb
index 613f114e..8e0dd768 100644
--- a/spec/overcommit/hook/pre_commit/author_email_spec.rb
+++ b/spec/overcommit/hook/pre_commit/author_email_spec.rb
@@ -30,11 +30,11 @@
     context 'when a custom pattern is specified' do
       let(:config) do
         super().merge(Overcommit::Configuration.new(
-          'PreCommit' => {
-            'AuthorEmail' => {
-              'pattern' => '^[^@]+@brigade\.com$'
-            }
-          }
+                        'PreCommit' => {
+                          'AuthorEmail' => {
+                            'pattern' => '^[^@]+@brigade\.com$'
+                          }
+                        }
         ))
       end
 
diff --git a/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb b/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb
index 633e14fe..b8360e2e 100644
--- a/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb
+++ b/spec/overcommit/hook/pre_commit/bundle_audit_spec.rb
@@ -54,7 +54,7 @@
 Title: Rest-Client Gem for Ruby logs password information in plaintext
 Solution: upgrade to >= 1.7.3
 Vulnerabilities found!
-MSG
+          MSG
         )
       end
 
@@ -67,7 +67,7 @@
         stdout: <<-MSG
 Insecure Source URI found: git://github.com/xxx/overcommit.git
 Vulnerabilities found!
-MSG
+        MSG
       )
     end
 
diff --git a/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb b/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb
index c61e4873..a734b3dc 100644
--- a/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb
+++ b/spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb
@@ -49,7 +49,7 @@
 aws-sdk-resources (newest 2.3.3, installed 2.3.1)
 config (newest 1.1.1, installed 1.1.0)
 ruby_parser (newest 3.8.2, installed 3.8.1)
-MSG
+        MSG
         )
       end
 
@@ -60,7 +60,7 @@
       let(:result) do
         double(stdout: <<-MSG
 Warning: the running version of Bundler is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bundler by running `gem install bundler`.
-MSG
+        MSG
         )
       end
 
diff --git a/spec/overcommit/hook/pre_commit/erb_lint_spec.rb b/spec/overcommit/hook/pre_commit/erb_lint_spec.rb
index fcb17199..e9272bfe 100644
--- a/spec/overcommit/hook/pre_commit/erb_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/erb_lint_spec.rb
@@ -36,7 +36,7 @@
 
 erb interpolation with '<%= (...).html_safe %>' in this context is never safe
 In file: app/views/posts/show.html.erb:10
-MSG
+        MSG
       end
 
       it { should fail_hook }
diff --git a/spec/overcommit/hook/pre_commit/fasterer_spec.rb b/spec/overcommit/hook/pre_commit/fasterer_spec.rb
index 405888ab..afb08791 100644
--- a/spec/overcommit/hook/pre_commit/fasterer_spec.rb
+++ b/spec/overcommit/hook/pre_commit/fasterer_spec.rb
@@ -36,7 +36,7 @@
 spec/models/blog_spec.rb
 Using each_with_index is slower than while loop. Occurred at lines: 12.
 2 files inspected, 0 offense detected
-      MSG
+        MSG
       )
     end
 
@@ -51,7 +51,7 @@
 spec/models/product_spec.rb
 Using each_with_index is slower than while loop. Occurred at lines: 52.
 1 files inspected, 1 offense detected
-      MSG
+        MSG
       )
     end
 
diff --git a/spec/overcommit/hook/pre_commit/flay_spec.rb b/spec/overcommit/hook/pre_commit/flay_spec.rb
index a64cd2c3..2a5d8140 100644
--- a/spec/overcommit/hook/pre_commit/flay_spec.rb
+++ b/spec/overcommit/hook/pre_commit/flay_spec.rb
@@ -38,7 +38,7 @@
   app/whatever21.rb:105
   app/whatever22.rb:76
 
-MSG
+        MSG
       )
     end
 
@@ -51,7 +51,7 @@
         success?: false,
         stdout: <<-MSG
 Total score (lower is better) = 0
-MSG
+        MSG
       )
     end
 
diff --git a/spec/overcommit/hook/pre_commit/hadolint_spec.rb b/spec/overcommit/hook/pre_commit/hadolint_spec.rb
index 4091ca0b..ad756f30 100644
--- a/spec/overcommit/hook/pre_commit/hadolint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/hadolint_spec.rb
@@ -31,7 +31,7 @@
         success?: false,
         stdout: <<-MSG
 Dockerfile:5 DL3015 Avoid additional packages by specifying `--no-install-recommends`
-      MSG
+        MSG
       )
     end
     let(:result_dockerfile_web) do
@@ -39,7 +39,7 @@
         success?: false,
         stdout: <<-MSG
 Dockerfile.web:13 DL3020 Use COPY instead of ADD for files and folders
-      MSG
+        MSG
       )
     end
 
@@ -52,7 +52,7 @@
         success?: false,
         stdout: <<-MSG
 Dockerfile:11 SC2086 Double quote to prevent globbing and word splitting.
-      MSG
+        MSG
       )
     end
     let(:result_dockerfile_web) do
diff --git a/spec/overcommit/hook/pre_commit/rake_target_spec.rb b/spec/overcommit/hook/pre_commit/rake_target_spec.rb
index 4a0cf400..e295e61f 100644
--- a/spec/overcommit/hook/pre_commit/rake_target_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rake_target_spec.rb
@@ -19,11 +19,11 @@
   context 'with targets parameter set' do
     let(:config) do
       super().merge(Overcommit::Configuration.new(
-        'PreCommit' => {
-          'RakeTarget' => {
-            'targets' => ['test'],
-          }
-        }
+                      'PreCommit' => {
+                        'RakeTarget' => {
+                          'targets' => ['test'],
+                        }
+                      }
       ))
     end
     let(:result) { double('result') }
diff --git a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
index a69b8122..e5aea475 100644
--- a/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yaml_lint_spec.rb
@@ -30,7 +30,7 @@
         stdout: <<-MSG
 file1.yaml:3:81: [error] line too long (253 > 80 characters) (line-length)
 file2.yml:41:81: [error] line too long (261 > 80 characters) (line-length)
-      MSG
+        MSG
       )
     end
 
@@ -44,7 +44,7 @@
         stdout: <<-MSG
 file1.yaml:3:81: [error] line too long (253 > 80 characters) (line-length)
 file2.yml:41:81: [warning] missing document start "---" (document-start)
-      MSG
+        MSG
       )
     end
 
@@ -56,7 +56,7 @@
         success?: false,
         stdout: <<-MSG
 file1.yaml:1:1: [warning] missing document start "---" (document-start)
-      MSG
+        MSG
       )
     end
 
diff --git a/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb b/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb
index d59779c9..d463d25d 100644
--- a/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yard_coverage_spec.rb
@@ -76,7 +76,7 @@
     context 'and it reports an error' do
       before do
         result.stub(:stdout).and_return(
-        <<-HEREDOC
+          <<-HEREDOC
         Files:          72
         Modules:        12 (    3 undocumented)
         Classes:        63 (   15 undocumented)
diff --git a/spec/overcommit/hook/pre_push/rake_target_spec.rb b/spec/overcommit/hook/pre_push/rake_target_spec.rb
index 45c93752..5147d089 100644
--- a/spec/overcommit/hook/pre_push/rake_target_spec.rb
+++ b/spec/overcommit/hook/pre_push/rake_target_spec.rb
@@ -19,11 +19,11 @@
   context 'with targets parameter set' do
     let(:config) do
       super().merge(Overcommit::Configuration.new(
-        'PrePush' => {
-          'RakeTarget' => {
-            'targets' => ['test'],
-          }
-        }
+                      'PrePush' => {
+                        'RakeTarget' => {
+                          'targets' => ['test'],
+                        }
+                      }
       ))
     end
     let(:result) { double('result') }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f0d93a7f..fe6f82da 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,7 +27,7 @@
     each { |f| require f }
 end
 
-Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.include GitSpecHelpers
diff --git a/spec/support/shell_helpers.rb b/spec/support/shell_helpers.rb
index d035e13a..786dac63 100644
--- a/spec/support/shell_helpers.rb
+++ b/spec/support/shell_helpers.rb
@@ -26,6 +26,7 @@ def wait_until(options = {})
     Timeout.timeout(options.fetch(:timeout) { 1 }) do
       loop do
         return if yield
+
         sleep options.fetch(:check_interval) { 0.1 }
       end
     end
diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/commit-msg
+++ b/template-dir/hooks/commit-msg
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/overcommit-hook
+++ b/template-dir/hooks/overcommit-hook
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/post-checkout
+++ b/template-dir/hooks/post-checkout
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/post-commit
+++ b/template-dir/hooks/post-commit
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/post-merge
+++ b/template-dir/hooks/post-merge
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/post-rewrite
+++ b/template-dir/hooks/post-rewrite
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/pre-commit
+++ b/template-dir/hooks/pre-commit
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/pre-push
+++ b/template-dir/hooks/pre-push
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/pre-rebase
+++ b/template-dir/hooks/pre-rebase
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
index 8b8c118c..197dc198 100755
--- a/template-dir/hooks/prepare-commit-msg
+++ b/template-dir/hooks/prepare-commit-msg
@@ -35,9 +35,9 @@ if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +80,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end

From 7d94fa55a74ceea705645d565a34ecefaca08ea5 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 31 May 2021 10:00:14 -0700
Subject: [PATCH 166/223] Fix deprecation warning for Bundler.with_clean_env

Fixes the following:

    [DEPRECATED] `Bundler.with_clean_env` has been deprecated in favor
    of `Bundler.with_unbundled_env`. If you instead want the environment
    before bundler was originally loaded, use `Bundler.with_original_env`
    (called at /Users/x/src/overcommit/spec/integration/gemfile_option_spec.rb:63)
---
 spec/integration/gemfile_option_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integration/gemfile_option_spec.rb b/spec/integration/gemfile_option_spec.rb
index 00019c48..7a0175da 100644
--- a/spec/integration/gemfile_option_spec.rb
+++ b/spec/integration/gemfile_option_spec.rb
@@ -60,7 +60,7 @@ def run
     repo do
       # Since RSpec is being run within a Bundler context we need to clear it
       # in order to not taint the test
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         FileUtils.mkdir_p(File.join(fake_gem_path, 'lib'))
         echo(gemspec, File.join(fake_gem_path, 'my_fake_gem.gemspec'))
         touch(File.join(fake_gem_path, 'lib', 'my_fake_gem.rb'))

From 8622f9e83fcd2b1e1bc1d19494d4c25843dbea5c Mon Sep 17 00:00:00 2001
From: R Gibim <9031589+Drowze@users.noreply.github.com>
Date: Wed, 2 Jun 2021 16:11:57 +0100
Subject: [PATCH 167/223] Fix pronto hooks with warning level (#755)

Pronto might raise warnings and that was not being correctly parsed by
Overcommit
---
 lib/overcommit/hook/shared/pronto.rb           | 10 +++++++---
 spec/overcommit/hook/pre_commit/pronto_spec.rb | 13 +++++++++----
 spec/overcommit/hook/pre_push/pronto_spec.rb   | 13 +++++++++----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lib/overcommit/hook/shared/pronto.rb b/lib/overcommit/hook/shared/pronto.rb
index b1d71442..9975fbc6 100644
--- a/lib/overcommit/hook/shared/pronto.rb
+++ b/lib/overcommit/hook/shared/pronto.rb
@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
 module Overcommit::Hook::Shared
-  # Shared code used by all Pronto hooks. Runs pronto linter.
+  # Shared code used by all Pronto hooks. Runs pronto linters.
+
+  # @see https://github.com/prontolabs/pronto
   module Pronto
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('E') ? :error : :warning
     end
 
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/.freeze
+
     def run
       result = execute(command)
       return :pass if result.success?
 
       extract_messages(
-        result.stdout.split("\n"),
-        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
+        result.stdout.split("\n").select { |line| line.match?(MESSAGE_REGEX) },
+        MESSAGE_REGEX,
         MESSAGE_TYPE_CATEGORIZER,
       )
     end
diff --git a/spec/overcommit/hook/pre_commit/pronto_spec.rb b/spec/overcommit/hook/pre_commit/pronto_spec.rb
index ed099ace..7a050d10 100644
--- a/spec/overcommit/hook/pre_commit/pronto_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pronto_spec.rb
@@ -41,10 +41,15 @@
 
     context 'and it reports a warning' do
       before do
-        result.stub(:stdout).and_return([
-          'file1.rb:12 W: Line is too long. [107/80]',
-          'file2.rb:14 I: Prefer single-quoted strings'
-        ].join("\n"))
+        result.stub(:stdout).and_return <<~MESSAGE
+          Running Pronto::Rubocop
+          file1.rb:12 W: Line is too long. [107/80]
+          file2.rb:14 I: Prefer single-quoted strings
+
+          ```suggestion
+          x = 'x'
+          ```
+        MESSAGE
       end
 
       it { should warn }
diff --git a/spec/overcommit/hook/pre_push/pronto_spec.rb b/spec/overcommit/hook/pre_push/pronto_spec.rb
index 2851a860..3ca660e5 100644
--- a/spec/overcommit/hook/pre_push/pronto_spec.rb
+++ b/spec/overcommit/hook/pre_push/pronto_spec.rb
@@ -41,10 +41,15 @@
 
     context 'and it reports a warning' do
       before do
-        result.stub(:stdout).and_return([
-          'file1.rb:12 W: Line is too long. [107/80]',
-          'file2.rb:14 I: Prefer single-quoted strings'
-        ].join("\n"))
+        result.stub(:stdout).and_return <<~MESSAGE
+          Running Pronto::Rubocop
+          file1.rb:12 W: Line is too long. [107/80]
+          file2.rb:14 I: Prefer single-quoted strings
+
+          ```suggestion
+          x = 'x'
+          ```
+        MESSAGE
       end
 
       it { should warn }

From 5fc63b962032891b03620ef62e6e9dd485a5f538 Mon Sep 17 00:00:00 2001
From: rymut <30433215+rymut@users.noreply.github.com>
Date: Wed, 3 Nov 2021 19:53:46 +0100
Subject: [PATCH 168/223] Fix encoding of process output under windows (#766)

* Fix encoding of process output under windows

Output of commands under windows is not UTF-8 by default, this
can lead to "invalid byte sequence in UTF-8" error on sylink check

* Fix coding style

* Fix invalid converter setting (UTF-8 to UTF-8)
---
 lib/overcommit/subprocess.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/subprocess.rb b/lib/overcommit/subprocess.rb
index 07e4fe04..3be06388 100644
--- a/lib/overcommit/subprocess.rb
+++ b/lib/overcommit/subprocess.rb
@@ -51,7 +51,7 @@ def spawn(args, options = {})
         err.rewind
         out.rewind
 
-        Result.new(process.exit_code, out.read, err.read)
+        Result.new(process.exit_code, to_utf8(out.read), to_utf8(err.read))
       end
 
       # Spawns a new process in the background using the given array of
@@ -83,6 +83,23 @@ def win32_prepare_args(args)
         %w[cmd.exe /c] + [args.join(' ')]
       end
 
+      # Convert string from current locale to utf-8
+      #
+      # When running commands under windows the command output is using
+      # current system locale (depends on system lanuage) not UTF-8
+      #
+      # @param process [String]
+      # @return [String]
+      def to_utf8(string)
+        if Encoding.locale_charmap == 'UTF-8'
+          return string
+        end
+
+        ec = Encoding::Converter.new(Encoding.locale_charmap, 'UTF-8')
+        # Convert encoding, alternatively simple: string.scrub will suffice
+        ec.convert(string)
+      end
+
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)

From a012e3e94bfcbdbdd11901237217f75ca6ed652e Mon Sep 17 00:00:00 2001
From: Eddie Lebow <elebow@users.noreply.github.com>
Date: Wed, 3 Nov 2021 15:43:51 -0400
Subject: [PATCH 169/223] Support hook type option to `--run` (#764)

Sometimes, especially during hook development, you want to force
running of a certain type of hook.

This adds an option to the `--run` parameter for specifying a hook
type. The default behavior is unchanged.

on-behalf-of: @Cofense <oss@cofense.com>
---
 lib/overcommit/cli.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/cli.rb b/lib/overcommit/cli.rb
index 9848c646..d8b743a3 100644
--- a/lib/overcommit/cli.rb
+++ b/lib/overcommit/cli.rb
@@ -94,8 +94,9 @@ def add_installation_options(opts)
         @options[:force] = true
       end
 
-      opts.on('-r', '--run', 'Run pre-commit hook against all git tracked files') do
+      opts.on('-r [hook]', '--run [hook]', 'Run specified hook against all git tracked files. Defaults to `pre_commit`.') do |arg|
         @options[:action] = :run_all
+        @options[:hook_to_run] = arg ? arg.to_s : 'run-all'
       end
     end
 
@@ -199,7 +200,7 @@ def sign
 
     def run_all
       empty_stdin = File.open(File::NULL) # pre-commit hooks don't take input
-      context = Overcommit::HookContext.create('run-all', config, @arguments, empty_stdin)
+      context = Overcommit::HookContext.create(@options[:hook_to_run], config, @arguments, empty_stdin)
       config.apply_environment!(context, ENV)
 
       printer = Overcommit::Printer.new(config, log, context)

From 2823a4277fcce33cab4c154b0659f82892b5d174 Mon Sep 17 00:00:00 2001
From: Bert McCutchen <bert.mccutchen@gmail.com>
Date: Fri, 19 Nov 2021 13:10:38 -0500
Subject: [PATCH 170/223] Fixed message Regex (#767)

---
 lib/overcommit/hook/pre_commit/stylelint.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/stylelint.rb b/lib/overcommit/hook/pre_commit/stylelint.rb
index e20bc8df..b129cbd2 100644
--- a/lib/overcommit/hook/pre_commit/stylelint.rb
+++ b/lib/overcommit/hook/pre_commit/stylelint.rb
@@ -8,7 +8,7 @@ class Stylelint < Base
     # example of output:
     # index.css: line 4, col 4, error - Expected indentation of 2 spaces (indentation)
 
-    MESSAGE_REGEX = /^(?<file>.+):\D*(?<line>\d+).*$/.freeze
+    MESSAGE_REGEX = /^(?<file>[^:]+):\D*(?<line>\d+).*$/.freeze
 
     def run
       result = execute(command, args: applicable_files)

From db2eff6402312e9ecc89db7d7ce511549073ce40 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 25 Feb 2022 20:26:27 -0800
Subject: [PATCH 171/223] Move from Travis CI to GitHub Actions (#770)

---
 .github/workflows/lint.yml  | 29 +++++++++++++++++++++
 .github/workflows/tests.yml | 52 +++++++++++++++++++++++++++++++++++++
 .travis.yml                 | 24 -----------------
 README.md                   |  3 +--
 4 files changed, 82 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/lint.yml
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 00000000..24baefc6
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,29 @@
+name: Lint
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  overcommit:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: Prepare environment
+        run: |
+          git config --local user.email "gh-actions@example.com"
+          git config --local user.name "GitHub Actions"
+          bundle exec overcommit --sign
+
+      - name: Run pre-commit checks
+        run: bundle exec overcommit --run
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 00000000..91ddb5b9
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,52 @@
+name: Tests
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  rspec:
+    timeout-minutes: 10
+    runs-on: ${{ matrix.os }}-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+        os:
+          - ubuntu
+          - windows
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec
+
+      - name: Code coverage reporting
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          flag-name: ruby${{ matrix.ruby-version }}-${{ matrix.os }}
+          parallel: true
+
+  finish:
+    needs: rspec
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Finalize code coverage report
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 7b489462..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: ruby
-
-cache: bundler
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-
-before_script:
-  - git config --global user.email "travis@travis.ci"
-  - git config --global user.name "Travis CI"
-
-before_install:
-  - gem update --system
-  - gem install bundler
-
-script:
-  - bundle exec rspec
-  - bundle exec overcommit --sign
-  - bundle exec overcommit --sign pre-commit
-  - bundle exec overcommit --run
diff --git a/README.md b/README.md
index 36126a2c..0464e604 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/overcommit.svg)](https://badge.fury.io/rb/overcommit)
-[![Build Status](https://travis-ci.org/sds/overcommit.svg?branch=master)](https://travis-ci.org/sds/overcommit)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/umui038jlm597ryf?svg=true)](https://ci.appveyor.com/project/sds/overcommit)
+[![Build Status](https://github.com/sds/overcommit/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/sds/overcommit/actions/workflows/tests.yml/badge.svg?branch=master)
 [![Coverage Status](https://coveralls.io/repos/github/sds/overcommit/badge.svg?branch=master)](https://coveralls.io/github/sds/overcommit?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/5da42f7f365e5fef6b4c/maintainability)](https://codeclimate.com/github/sds/overcommit/maintainability)
 [![Inline docs](http://inch-ci.org/github/sds/overcommit.svg?branch=master)](http://inch-ci.org/github/sds/overcommit)

From c142cd27fbfcbf67907f2cb3d6710808af0b74d3 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 25 Feb 2022 22:18:00 -0800
Subject: [PATCH 172/223] Fix configuration loading on Ruby 3.1 (#771)

---
 .github/workflows/lint.yml                    |  5 +-
 .github/workflows/tests.yml                   |  6 +-
 .projections.json                             | 10 ---
 .simplecov                                    |  6 --
 Gemfile                                       |  4 +-
 appveyor.yml                                  | 61 -------------------
 lib/overcommit/cli.rb                         |  4 +-
 lib/overcommit/hook/pre_commit/php_lint.rb    |  4 +-
 spec/overcommit/default_configuration_spec.rb |  6 +-
 .../hook/pre_commit/php_lint_spec.rb          |  4 +-
 spec/overcommit/hook/pre_commit/phpcs_spec.rb |  8 +--
 spec/overcommit/utils_spec.rb                 | 10 +--
 spec/spec_helper.rb                           | 25 +++++---
 template-dir/hooks/commit-msg                 |  9 ++-
 template-dir/hooks/overcommit-hook            |  9 ++-
 template-dir/hooks/post-checkout              |  9 ++-
 template-dir/hooks/post-commit                |  9 ++-
 template-dir/hooks/post-merge                 |  9 ++-
 template-dir/hooks/post-rewrite               |  9 ++-
 template-dir/hooks/pre-commit                 |  9 ++-
 template-dir/hooks/pre-push                   |  9 ++-
 template-dir/hooks/pre-rebase                 |  9 ++-
 template-dir/hooks/prepare-commit-msg         |  9 ++-
 23 files changed, 126 insertions(+), 117 deletions(-)
 delete mode 100644 .projections.json
 delete mode 100644 .simplecov
 delete mode 100644 appveyor.yml

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 24baefc6..b1879f09 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -21,9 +21,10 @@ jobs:
 
       - name: Prepare environment
         run: |
-          git config --local user.email "gh-actions@example.com"
-          git config --local user.name "GitHub Actions"
+          git config --global user.email "gh-actions@example.com"
+          git config --global user.name "GitHub Actions"
           bundle exec overcommit --sign
+          bundle exec overcommit --sign pre-commit
 
       - name: Run pre-commit checks
         run: bundle exec overcommit --run
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 91ddb5b9..e57f5204 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,6 @@ jobs:
           - '3.1'
         os:
           - ubuntu
-          - windows
 
     steps:
       - uses: actions/checkout@v2
@@ -31,7 +30,10 @@ jobs:
           bundler-cache: true
 
       - name: Run tests
-        run: bundle exec rspec
+        run: |
+          git config --global user.email "gh-actions@example.com"
+          git config --global user.name "GitHub Actions"
+          bundle exec rspec
 
       - name: Code coverage reporting
         uses: coverallsapp/github-action@master
diff --git a/.projections.json b/.projections.json
deleted file mode 100644
index 24f5ce34..00000000
--- a/.projections.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "lib/overcommit/*.rb": {
-    "alternate": "spec/overcommit/{}_spec.rb",
-    "type": "source"
-  },
-  "spec/overcommit/*_spec.rb": {
-    "alternate": "lib/overcommit/{}.rb",
-    "type": "test"
-  }
-}
diff --git a/.simplecov b/.simplecov
deleted file mode 100644
index 3cc40052..00000000
--- a/.simplecov
+++ /dev/null
@@ -1,6 +0,0 @@
-SimpleCov.start do
-  add_filter 'bin/'
-  add_filter 'libexec/'
-  add_filter 'spec/'
-  add_filter 'template-dir/'
-end
diff --git a/Gemfile b/Gemfile
index d1cd3c37..ff22be0c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,8 +8,8 @@ gemspec
 
 gem 'rspec', '~> 3.0'
 
-# Generate coverage information in Travis builds
-gem 'coveralls', '~> 0.8'
+gem 'simplecov', '~> 0.21.0'
+gem 'simplecov-lcov', '~> 0.8.0'
 
 # Pin RuboCop for Travis builds.
 gem 'rubocop', '0.82.0'
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index fcb90b95..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-version: "{build}"
-
-clone_depth: 1
-
-environment:
-  matrix:
-    - RUBY_FOLDER_VERSION: "24-x64"
-    - RUBY_FOLDER_VERSION: "25-x64"
-    - RUBY_FOLDER_VERSION: "26-x64"
-matrix:
-  fast_finish: true
-
-cache:
-  # Cache installed gems unless dependencies change
-  - vendor\bundle -> Gemfile,overcommit.gemspec
-
-install:
-  # Add ruby executables to PATH
-  - set PATH=C:\Ruby%RUBY_FOLDER_VERSION%\bin;%PATH%
-  - echo %PATH%
-
-  # Print version and location for pre-installed grep
-  - grep --version
-  - where grep
-
-  # Print version and location for pre-installed git
-  - git --version
-  - where git
-
-  # Print version and location for pre-installed ruby
-  - ruby --version
-  - where ruby
-
-  # Install latest version of RubyGems
-  - gem update --system --no-document
-  - gem --version
-  - where gem
-
-  # Install latest Bundler to work around version issues
-  - gem install bundler:'< 2' --force
-  - where bundler
-
-  # Install ruby dependencies
-  - bundle install --retry 3 --path vendor\bundle
-
-build: off
-
-before_test:
-  # Necessary for AuthorName and AuthorEmail pre-commit hooks to pass
-  - git config --global user.email "appveyor@appveyor.ci"
-  - git config --global user.name "Appveyor CI"
-
-  # Ignore CRLF conversion warnings
-  - git config --global core.autocrlf true
-  - git config --global core.safecrlf false
-
-test_script:
-  - bundle exec rspec --tty --backtrace --color
-  - bundle exec overcommit --sign
-  - bundle exec overcommit --sign pre-commit
-  - bundle exec overcommit --run
diff --git a/lib/overcommit/cli.rb b/lib/overcommit/cli.rb
index d8b743a3..bc2ec994 100644
--- a/lib/overcommit/cli.rb
+++ b/lib/overcommit/cli.rb
@@ -94,7 +94,7 @@ def add_installation_options(opts)
         @options[:force] = true
       end
 
-      opts.on('-r [hook]', '--run [hook]', 'Run specified hook against all git tracked files. Defaults to `pre_commit`.') do |arg|
+      opts.on('-r [hook]', '--run [hook]', 'Run specified hook against all git tracked files. Defaults to `pre_commit`.') do |arg| # rubocop:disable Layout/LineLength
         @options[:action] = :run_all
         @options[:hook_to_run] = arg ? arg.to_s : 'run-all'
       end
@@ -200,7 +200,7 @@ def sign
 
     def run_all
       empty_stdin = File.open(File::NULL) # pre-commit hooks don't take input
-      context = Overcommit::HookContext.create(@options[:hook_to_run], config, @arguments, empty_stdin)
+      context = Overcommit::HookContext.create(@options[:hook_to_run], config, @arguments, empty_stdin) # rubocop:disable Layout/LineLength
       config.apply_environment!(context, ENV)
 
       printer = Overcommit::Printer.new(config, log, context)
diff --git a/lib/overcommit/hook/pre_commit/php_lint.rb b/lib/overcommit/hook/pre_commit/php_lint.rb
index 3f70bfb2..f2ba2f24 100644
--- a/lib/overcommit/hook/pre_commit/php_lint.rb
+++ b/lib/overcommit/hook/pre_commit/php_lint.rb
@@ -4,9 +4,9 @@ module Overcommit::Hook::PreCommit
   # Runs `php -l` against any modified PHP files.
   class PhpLint < Base
     # Sample String
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     #   PHP Parse error:  syntax error, unexpected 'require_once' (T_REQUIRE_ONCE) in site/sumo.php on line 12
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
     MESSAGE_REGEX = /^(?<type>.+)\:\s+(?<message>.+) in (?<file>.+) on line (?<line>\d+)/.freeze
 
     def run
diff --git a/spec/overcommit/default_configuration_spec.rb b/spec/overcommit/default_configuration_spec.rb
index a86b1fe3..706af872 100644
--- a/spec/overcommit/default_configuration_spec.rb
+++ b/spec/overcommit/default_configuration_spec.rb
@@ -4,7 +4,11 @@
 
 describe 'default configuration' do
   default_config =
-    YAML.load_file(Overcommit::ConfigurationLoader::DEFAULT_CONFIG_PATH).to_hash
+    begin
+      YAML.load_file(Overcommit::ConfigurationLoader::DEFAULT_CONFIG_PATH, aliases: true).to_hash
+    rescue ArgumentError
+      YAML.load_file(Overcommit::ConfigurationLoader::DEFAULT_CONFIG_PATH).to_hash
+    end
 
   Overcommit::Utils.supported_hook_types.each do |hook_type|
     hook_class = Overcommit::Utils.camel_case(hook_type)
diff --git a/spec/overcommit/hook/pre_commit/php_lint_spec.rb b/spec/overcommit/hook/pre_commit/php_lint_spec.rb
index aff0b97e..ec755345 100644
--- a/spec/overcommit/hook/pre_commit/php_lint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/php_lint_spec.rb
@@ -26,13 +26,13 @@
   context 'when php lint exits unsuccessfully' do
     before do
       # php -l prints the same to both stdout and stderr
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       sample_output = [
         '',
         "Parse error: syntax error, unexpected '0' (T_LNUMBER), expecting variable (T_VARIABLE) or '{' or '$' in sample.php on line 3 ",
         'Errors parsing invalid.php',
       ].join("\n")
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       result = double('result')
       result.stub(:status).and_return(255)
diff --git a/spec/overcommit/hook/pre_commit/phpcs_spec.rb b/spec/overcommit/hook/pre_commit/phpcs_spec.rb
index 3df6cfb5..6982a297 100644
--- a/spec/overcommit/hook/pre_commit/phpcs_spec.rb
+++ b/spec/overcommit/hook/pre_commit/phpcs_spec.rb
@@ -39,12 +39,12 @@
 
     context 'and it reports a warning' do
       before do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         sample_output = [
           'File,Line,Column,Type,Message,Source,Severity,Fixable',
           '"/Users/craig/HelpScout/overcommit-testing/invalid.php",5,1,warning,"Possible parse error: FOREACH has no AS statement",Squiz.ControlStructures.ForEachLoopDeclaration.MissingAs,5,0'
         ].join("\n")
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
         result.stub(:stdout).and_return(sample_output)
       end
 
@@ -53,12 +53,12 @@
 
     context 'and it reports an error' do
       before do
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         sample_output = [
           'File,Line,Column,Type,Message,Source,Severity,Fixable',
           '"/Users/craig/HelpScout/overcommit-testing/invalid.php",5,1,error,"Inline control structures are not allowed",Generic.ControlStructures.InlineControlStructure.NotAllowed,5,1'
         ].join("\n")
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
         result.stub(:stdout).and_return(sample_output)
       end
 
diff --git a/spec/overcommit/utils_spec.rb b/spec/overcommit/utils_spec.rb
index 3be592ff..6bf75923 100644
--- a/spec/overcommit/utils_spec.rb
+++ b/spec/overcommit/utils_spec.rb
@@ -119,17 +119,17 @@
   describe '.supported_hook_types' do
     subject { described_class.supported_hook_types }
 
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     it { should =~ %w[commit-msg pre-commit post-checkout post-commit post-merge post-rewrite pre-push pre-rebase prepare-commit-msg] }
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
   end
 
   describe '.supported_hook_type_classes' do
     subject { described_class.supported_hook_type_classes }
 
-    # rubocop:disable Metrics/LineLength
+    # rubocop:disable Layout/LineLength
     it { should =~ %w[CommitMsg PreCommit PostCheckout PostCommit PostMerge PostRewrite PrePush PreRebase PrepareCommitMsg] }
-    # rubocop:enable Metrics/LineLength
+    # rubocop:enable Layout/LineLength
   end
 
   describe '.parent_command' do
@@ -190,7 +190,7 @@
       it 'invokes CommandSplitter.execute' do
         Overcommit::CommandSplitter.
           should_receive(:execute).
-          with(arguments, args: splittable_args).
+          with(arguments, { args: splittable_args }).
           and_return(double(status: 0, stdout: '', stderr: ''))
         subject
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index fe6f82da..89d30fbe 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,13 +1,22 @@
 # frozen_string_literal: true
 
-if ENV['TRAVIS']
-  # When running in Travis, report coverage stats to Coveralls.
-  require 'coveralls'
-  Coveralls.wear!
-else
-  # Otherwise render coverage information in coverage/index.html and display
-  # coverage percentage in the console.
-  require 'simplecov'
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'bin/'
+  add_filter 'libexec/'
+  add_filter 'spec/'
+  add_filter 'template-dir/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
 end
 
 require 'overcommit'
diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/commit-msg
+++ b/template-dir/hooks/commit-msg
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/overcommit-hook
+++ b/template-dir/hooks/overcommit-hook
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/post-checkout
+++ b/template-dir/hooks/post-checkout
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/post-commit
+++ b/template-dir/hooks/post-commit
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/post-merge
+++ b/template-dir/hooks/post-merge
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/post-rewrite
+++ b/template-dir/hooks/post-rewrite
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/pre-commit
+++ b/template-dir/hooks/pre-commit
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/pre-push
+++ b/template-dir/hooks/pre-push
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/pre-rebase
+++ b/template-dir/hooks/pre-rebase
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
index 197dc198..7f8023de 100755
--- a/template-dir/hooks/prepare-commit-msg
+++ b/template-dir/hooks/prepare-commit-msg
@@ -29,7 +29,14 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 

From 33d4ae7c89a8d5597143a5666c126bd8a9b2880a Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Fri, 25 Feb 2022 22:37:08 -0800
Subject: [PATCH 173/223] Fix `YamlSyntax` to specify `aliases` option (#772)

---
 lib/overcommit/hook/pre_commit/yaml_syntax.rb       | 10 +++++++---
 spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/yaml_syntax.rb b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
index fa0c4e66..493e9c5a 100644
--- a/lib/overcommit/hook/pre_commit/yaml_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
@@ -8,9 +8,13 @@ def run
 
       applicable_files.each do |file|
         begin
-          YAML.load_file(file)
-        rescue ArgumentError, Psych::SyntaxError => e
-          messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
+          YAML.load_file(file, aliases: true)
+        rescue ArgumentError
+          begin
+            YAML.load_file(file)
+          rescue ArgumentError, Psych::SyntaxError => e
+            messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
+          end
         end
       end
 
diff --git a/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb b/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb
index 29cb7b02..a6f61f2c 100644
--- a/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb
+++ b/spec/overcommit/hook/pre_commit/yaml_syntax_spec.rb
@@ -22,6 +22,7 @@
 
   context 'when YAML file has errors' do
     before do
+      YAML.stub(:load_file).with(staged_file, { aliases: true }).and_raise(ArgumentError)
       YAML.stub(:load_file).with(staged_file).and_raise(ArgumentError)
     end
 

From c9f78d3fca71152ecb587a2fbbabaa03eb3eac3d Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 26 Feb 2022 20:50:31 -0800
Subject: [PATCH 174/223] Fix Windows builds (#773)

---
 .github/workflows/tests.yml   | 10 +++++++++-
 lib/overcommit/subprocess.rb  |  5 +++++
 spec/overcommit/utils_spec.rb |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e57f5204..848db60c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,10 +7,11 @@ on:
 
 jobs:
   rspec:
-    timeout-minutes: 10
+    timeout-minutes: 15
     runs-on: ${{ matrix.os }}-latest
 
     strategy:
+      fail-fast: false
       matrix:
         ruby-version:
           - '2.6'
@@ -19,6 +20,13 @@ jobs:
           - '3.1'
         os:
           - ubuntu
+          - windows
+
+        # Tempfile behavior has changed on Ruby 3.1 such that tests
+        # fail with permission denied. Would welcome a PR with a fix.
+        exclude:
+          - ruby-version: '3.1'
+            os: windows
 
     steps:
       - uses: actions/checkout@v2
diff --git a/lib/overcommit/subprocess.rb b/lib/overcommit/subprocess.rb
index 3be06388..5899274f 100644
--- a/lib/overcommit/subprocess.rb
+++ b/lib/overcommit/subprocess.rb
@@ -2,6 +2,7 @@
 
 require 'childprocess'
 require 'tempfile'
+require 'overcommit/os'
 
 module Overcommit
   # Manages execution of a child process, collecting the exit status and
@@ -91,6 +92,10 @@ def win32_prepare_args(args)
       # @param process [String]
       # @return [String]
       def to_utf8(string)
+        # Our encoding code doesn't work on the GitHub Actions Windows
+        # environment for unknown reasons, so just skip it in CI.
+        return string if OS.windows? && ENV['GITHUB_ACTIONS']
+
         if Encoding.locale_charmap == 'UTF-8'
           return string
         end
diff --git a/spec/overcommit/utils_spec.rb b/spec/overcommit/utils_spec.rb
index 6bf75923..acaf3eba 100644
--- a/spec/overcommit/utils_spec.rb
+++ b/spec/overcommit/utils_spec.rb
@@ -215,7 +215,7 @@
     end
 
     it 'executes the command' do
-      wait_until { subject.exited? } # Make sure process terminated before checking
+      wait_until(timeout: 5) { subject.exited? } # Make sure process terminated before checking
       File.exist?('some-file').should == true
     end
   end

From 736299665d9ad70d104281420f1cddaa29645e7f Mon Sep 17 00:00:00 2001
From: R Gibim <9031589+Drowze@users.noreply.github.com>
Date: Thu, 28 Apr 2022 16:50:30 +0100
Subject: [PATCH 175/223] Fix pronto hooks swallowing generic errors (#779)

---
 lib/overcommit/hook/shared/pronto.rb           | 10 +++++++++-
 spec/overcommit/hook/pre_commit/pronto_spec.rb | 13 +++++++++++++
 spec/overcommit/hook/pre_push/pronto_spec.rb   | 13 +++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/shared/pronto.rb b/lib/overcommit/hook/shared/pronto.rb
index 9975fbc6..cf8a3139 100644
--- a/lib/overcommit/hook/shared/pronto.rb
+++ b/lib/overcommit/hook/shared/pronto.rb
@@ -15,11 +15,19 @@ def run
       result = execute(command)
       return :pass if result.success?
 
-      extract_messages(
+      # e.g. runtime errors
+      generic_errors = extract_messages(
+        result.stderr.split("\n"),
+        /^(?<type>[a-z]+)/i
+      )
+
+      pronto_infractions = extract_messages(
         result.stdout.split("\n").select { |line| line.match?(MESSAGE_REGEX) },
         MESSAGE_REGEX,
         MESSAGE_TYPE_CATEGORIZER,
       )
+
+      generic_errors + pronto_infractions
     end
   end
 end
diff --git a/spec/overcommit/hook/pre_commit/pronto_spec.rb b/spec/overcommit/hook/pre_commit/pronto_spec.rb
index 7a050d10..c9d56abe 100644
--- a/spec/overcommit/hook/pre_commit/pronto_spec.rb
+++ b/spec/overcommit/hook/pre_commit/pronto_spec.rb
@@ -31,6 +31,7 @@
 
     context 'and it reports an error' do
       before do
+        result.stub(:stderr).and_return('')
         result.stub(:stdout).and_return([
           'file2.rb:10 E: IDENTICAL code found in :iter.',
         ].join("\n"))
@@ -41,6 +42,7 @@
 
     context 'and it reports a warning' do
       before do
+        result.stub(:stderr).and_return('')
         result.stub(:stdout).and_return <<~MESSAGE
           Running Pronto::Rubocop
           file1.rb:12 W: Line is too long. [107/80]
@@ -54,5 +56,16 @@
 
       it { should warn }
     end
+
+    context 'and it has a generic error message written to stderr' do
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return([
+          'Could not find pronto in any of the sources'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
   end
 end
diff --git a/spec/overcommit/hook/pre_push/pronto_spec.rb b/spec/overcommit/hook/pre_push/pronto_spec.rb
index 3ca660e5..5f48b7d7 100644
--- a/spec/overcommit/hook/pre_push/pronto_spec.rb
+++ b/spec/overcommit/hook/pre_push/pronto_spec.rb
@@ -31,6 +31,7 @@
 
     context 'and it reports an error' do
       before do
+        result.stub(:stderr).and_return('')
         result.stub(:stdout).and_return([
           'file2.rb:10 E: IDENTICAL code found in :iter.',
         ].join("\n"))
@@ -41,6 +42,7 @@
 
     context 'and it reports a warning' do
       before do
+        result.stub(:stderr).and_return('')
         result.stub(:stdout).and_return <<~MESSAGE
           Running Pronto::Rubocop
           file1.rb:12 W: Line is too long. [107/80]
@@ -54,5 +56,16 @@
 
       it { should warn }
     end
+
+    context 'and it has a generic error message written to stderr' do
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return([
+          'Could not find pronto in any of the sources'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
   end
 end

From f9ecdcb909ad9df49ab28eb1aa0b5277b3ff08eb Mon Sep 17 00:00:00 2001
From: Rick Mark <rickmark@outlook.com>
Date: Thu, 28 Apr 2022 10:14:30 -0700
Subject: [PATCH 176/223] Partial log flushing to make long hooks intuitive
 (#777)

* Update specs to work when global config is using `main` for initial branch

* Support flushing logs to allow long scripts to become obvious
---
 lib/overcommit/logger.rb         | 5 +++++
 lib/overcommit/printer.rb        | 7 +++----
 spec/spec_helper.rb              | 1 +
 spec/support/git_spec_helpers.rb | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/overcommit/logger.rb b/lib/overcommit/logger.rb
index a9ff793c..9f5d4248 100644
--- a/lib/overcommit/logger.rb
+++ b/lib/overcommit/logger.rb
@@ -31,6 +31,11 @@ def newline
       log
     end
 
+    # Flushes the [IO] object for partial lines
+    def flush
+      @out.flush if @out.respond_to? :flush
+    end
+
     # Write a line of output.
     #
     # A newline character will always be appended.
diff --git a/lib/overcommit/printer.rb b/lib/overcommit/printer.rb
index 02d0995d..fcb69653 100644
--- a/lib/overcommit/printer.rb
+++ b/lib/overcommit/printer.rb
@@ -43,16 +43,14 @@ def end_hook(hook, status, output)
     end
 
     def interrupt_triggered
-      log.newline
-      log.error 'Interrupt signal received. Stopping hooks...'
+      log.error "\nInterrupt signal received. Stopping hooks..."
     end
 
     # Executed when a hook run was interrupted/cancelled by user.
     def run_interrupted
       log.newline
       log.warning '⚠  Hook run interrupted by user'
-      log.warning '⚠  If files appear modified/missing, check your stash to recover them'
-      log.newline
+      log.warning "⚠  If files appear modified/missing, check your stash to recover them\n"
     end
 
     # Executed when one or more hooks by the end of the run.
@@ -91,6 +89,7 @@ def print_header(hook)
       log.partial hook.description
       log.partial '.' * [70 - hook.description.length - hook_name.length, 0].max
       log.partial hook_name
+      log.flush
     end
 
     def print_result(hook, status, output) # rubocop:disable Metrics/CyclomaticComplexity
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 89d30fbe..b6a24d82 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bundler'
 require 'simplecov'
 SimpleCov.start do
   add_filter 'bin/'
diff --git a/spec/support/git_spec_helpers.rb b/spec/support/git_spec_helpers.rb
index 23e46c51..28eb94da 100644
--- a/spec/support/git_spec_helpers.rb
+++ b/spec/support/git_spec_helpers.rb
@@ -13,7 +13,7 @@ module GitSpecHelpers
   # @return [String] path of the repository
   def repo(options = {})
     directory('some-repo') do
-      create_cmd = %w[git init]
+      create_cmd = %w[git init --initial-branch=master]
       create_cmd += ['--template', options[:template_dir]] if options[:template_dir]
       create_cmd += ['--separate-git-dir', options[:git_dir]] if options[:git_dir]
 

From 274e8d61a2c71615c820c0bb80b2977e2cf3c4d6 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 28 Apr 2022 14:00:34 -0400
Subject: [PATCH 177/223] Cut version 0.59.0 (#780)

Includes a disablement of one of the Windows tests on Ruby 3.0
---
 CHANGELOG.md                         | 10 +++++++++-
 lib/overcommit/version.rb            |  2 +-
 spec/integration/parallelize_spec.rb | 12 +++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f27e6208..86a5d38b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
 # Overcommit Changelog
 
-## master (unreleased)
+## 0.59.0
 
 * Add `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook to ignore non-existent cops. Requires RuboCop `0.82.0` or newer.
+* Fix deprecation warning for `Bundler.with_clean_env`.
+* Fix handling of some kinds of pronto errors in the `Pronto` hook.
+* Fix encoding of process output on Windows.
+* Add support for specifying hook type to `--run` flag.
+* Fix message regex parser for Stylelint.
+* Fix configuration loading on Ruby 3.1.
+* Fix `YamlSyntax` to support aliases when parsing.
+* Fix run output to explicitly flush partial logs.
 
 ## 0.58.0
 
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index ec9b0cca..8b90a4dc 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.58.0'
+  VERSION = '0.59.0'
 end
diff --git a/spec/integration/parallelize_spec.rb b/spec/integration/parallelize_spec.rb
index 20a86be3..471aa7b3 100644
--- a/spec/integration/parallelize_spec.rb
+++ b/spec/integration/parallelize_spec.rb
@@ -27,8 +27,14 @@
     end
   end
 
-  it 'does not hang' do
-    result = Timeout.timeout(5) { subject }
-    result.stderr.should_not include 'No live threads left. Deadlock?'
+  # Test fails on Ruby 3.0 on Windows but nothing else. Would glady accept a pull
+  # request that resolves.
+  unless Overcommit::OS.windows? &&
+    Overcommit::Utils::Version.new(RUBY_VERSION) >= '3' &&
+    Overcommit::Utils::Version.new(RUBY_VERSION) < '3.1'
+    it 'does not hang' do
+      result = Timeout.timeout(5) { subject }
+      result.stderr.should_not include 'No live threads left. Deadlock?'
+    end
   end
 end

From 1f7e5a2439a8861ccf1a9e171f68f0e7b77e0837 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 3 May 2022 09:21:58 -0400
Subject: [PATCH 178/223] Revert `Fix encoding of process output under windows`
 (#784)

This appears to break usage under Linux. Until a proper solution can be
implemented, revert.
---
 lib/overcommit/subprocess.rb | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/lib/overcommit/subprocess.rb b/lib/overcommit/subprocess.rb
index 5899274f..41175fb9 100644
--- a/lib/overcommit/subprocess.rb
+++ b/lib/overcommit/subprocess.rb
@@ -52,7 +52,7 @@ def spawn(args, options = {})
         err.rewind
         out.rewind
 
-        Result.new(process.exit_code, to_utf8(out.read), to_utf8(err.read))
+        Result.new(process.exit_code, out.read, err.read)
       end
 
       # Spawns a new process in the background using the given array of
@@ -84,27 +84,6 @@ def win32_prepare_args(args)
         %w[cmd.exe /c] + [args.join(' ')]
       end
 
-      # Convert string from current locale to utf-8
-      #
-      # When running commands under windows the command output is using
-      # current system locale (depends on system lanuage) not UTF-8
-      #
-      # @param process [String]
-      # @return [String]
-      def to_utf8(string)
-        # Our encoding code doesn't work on the GitHub Actions Windows
-        # environment for unknown reasons, so just skip it in CI.
-        return string if OS.windows? && ENV['GITHUB_ACTIONS']
-
-        if Encoding.locale_charmap == 'UTF-8'
-          return string
-        end
-
-        ec = Encoding::Converter.new(Encoding.locale_charmap, 'UTF-8')
-        # Convert encoding, alternatively simple: string.scrub will suffice
-        ec.convert(string)
-      end
-
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)

From f777eb339aaed0f60095d634d0da1bf18d18c9e8 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 3 May 2022 09:48:27 -0400
Subject: [PATCH 179/223] Revert addition of `--disable-pending-cops` flag to
 RuboCop (#783)

It seems like this breaks some other workflows. Prefer the user
specifying this themselves if they want it.
---
 config/default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.yml b/config/default.yml
index 51189348..bfd91e08 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -703,7 +703,7 @@ PreCommit:
     enabled: false
     description: 'Analyze with RuboCop'
     required_executable: 'rubocop'
-    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names', '--disable-pending-cops']
+    flags: ['--format=emacs', '--force-exclusion', '--display-cop-names']
     install_command: 'gem install rubocop'
     include:
       - '**/*.gemspec'

From a2ab659e03d3c4cd10a3cd3ac9691cc3396d041b Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 3 May 2022 09:53:15 -0400
Subject: [PATCH 180/223] Cut version 0.59.1 (#785)

---
 CHANGELOG.md              | 5 +++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86a5d38b..aa326ff2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## 0.59.1
+
+* Remove `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook.
+* Remove special handling of process output on Windows since it broke on Linux.
+
 ## 0.59.0
 
 * Add `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook to ignore non-existent cops. Requires RuboCop `0.82.0` or newer.
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 8b90a4dc..e8f6bb39 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.59.0'
+  VERSION = '0.59.1'
 end

From 8812c5f0560da43e1fa2c613684ea9b628945628 Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Sun, 11 Sep 2022 07:21:16 -0300
Subject: [PATCH 181/223] Allow overriding Gemfile.lock (#796)

* Allow overriding Gemfile.lock

* Fix lint rule violation
---
 lib/overcommit/hook/pre_commit/bundle_check.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/bundle_check.rb b/lib/overcommit/hook/pre_commit/bundle_check.rb
index 10d30d2c..70f5fa2e 100644
--- a/lib/overcommit/hook/pre_commit/bundle_check.rb
+++ b/lib/overcommit/hook/pre_commit/bundle_check.rb
@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://bundler.io/
   class BundleCheck < Base
-    LOCK_FILE = 'Gemfile.lock'
+    LOCK_FILE = File.basename(ENV['BUNDLE_GEMFILE'] || 'Gemfile') + '.lock'
 
     def run
       # Ignore if Gemfile.lock is not tracked by git

From 1e62370e8b29a96961c3f9c4e17d936dbcb05e19 Mon Sep 17 00:00:00 2001
From: Mark Delk <jethrodaniel@gmail.com>
Date: Sun, 18 Dec 2022 17:00:33 -0600
Subject: [PATCH 182/223] support trailing space in replace_branch's
 'replacement_text' config (#804)

---
 lib/overcommit/hook/prepare_commit_msg/replace_branch.rb  | 8 ++++----
 .../hook/prepare_commit_msg/replace_branch_spec.rb        | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index 7a40ed69..e8c09887 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -11,9 +11,9 @@ module Overcommit::Hook::PrepareCommitMsg
   # For instance, if your current branch is `123-topic` then this config
   #
   #    branch_pattern: '(\d+)-(\w+)'
-  #    replacement_text: '[#\1]'
+  #    replacement_text: '[#\1] '
   #
-  # would make this hook prepend commit messages with `[#123]`.
+  # would make this hook prepend commit messages with `[#123] `.
   #
   # Similarly, a replacement text of `[\1][\2]` would result in `[123][topic]`.
   #
@@ -53,7 +53,7 @@ def new_template
       @new_template ||=
         begin
           curr_branch = Overcommit::GitRepo.current_branch
-          curr_branch.gsub(branch_pattern, replacement_text).strip
+          curr_branch.gsub(branch_pattern, replacement_text)
         end
     end
 
@@ -69,7 +69,7 @@ def replacement_text
       @replacement_text ||=
         begin
           if File.exist?(replacement_text_config)
-            File.read(replacement_text_config)
+            File.read(replacement_text_config).chomp
           else
             replacement_text_config
           end
diff --git a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
index 3844f77a..6af27921 100644
--- a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
@@ -62,6 +62,14 @@ def remove_file(name)
       it 'prepends the replacement text' do
         expect(File.read('COMMIT_EDITMSG')).to eq("[#123]\n")
       end
+
+      context 'when the replacement text contains a space' do
+        let(:config) { new_config('replacement_text' => '[\1] ') }
+
+        it 'prepends the replacement text, including the space' do
+          expect(File.read('COMMIT_EDITMSG')).to eq("[123] \n")
+        end
+      end
     end
 
     context "when the checked out branch doesn't matches the pattern" do

From 9aa62593f56c2f5f09d411214f482252c9a300a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dino=20Kova=C4=8D?= <reisub@users.noreply.github.com>
Date: Mon, 19 Dec 2022 00:01:18 +0100
Subject: [PATCH 183/223] Add MixFormat hook (#801)

---
 config/default.yml                            | 10 ++++
 lib/overcommit/hook/pre_commit/mix_format.rb  | 30 ++++++++++++
 .../hook/pre_commit/mix_format_spec.rb        | 47 +++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_commit/mix_format.rb
 create mode 100644 spec/overcommit/hook/pre_commit/mix_format_spec.rb

diff --git a/config/default.yml b/config/default.yml
index bfd91e08..42ea17a8 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -536,6 +536,16 @@ PreCommit:
     required_executable: 'grep'
     flags: ['-IHn', "^<<<<<<<[ \t]"]
 
+  MixFormat:
+    enabled: false
+    description: 'Check formatting with mix format'
+    required_executable: 'mix'
+    flags: ['format', '--check-formatted']
+    include:
+      - '**/*.ex'
+      - '**/*.heex'
+      - '**/*.exs'
+
   PuppetMetadataJsonLint:
     enabled: false
     description: 'Checking module metadata'
diff --git a/lib/overcommit/hook/pre_commit/mix_format.rb b/lib/overcommit/hook/pre_commit/mix_format.rb
new file mode 100644
index 00000000..2fa07551
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/mix_format.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `mix format --check-formatted` against any modified ex/heex/exs files.
+  #
+  # @see https://hexdocs.pm/mix/main/Mix.Tasks.Format.html
+  class MixFormat < Base
+    # example message:
+    # ** (Mix) mix format failed due to --check-formatted.
+    # The following files are not formatted:
+    #
+    #   * lib/file1.ex
+    #   * lib/file2.ex
+    FILES_REGEX = /^\s+\*\s+(?<file>.+)$/.freeze
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      result.stderr.scan(FILES_REGEX).flatten.
+        map { |file| message(file) }
+    end
+
+    private
+
+    def message(file)
+      Overcommit::Hook::Message.new(:error, file, nil, file)
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/mix_format_spec.rb b/spec/overcommit/hook/pre_commit/mix_format_spec.rb
new file mode 100644
index 00000000..9acc50ed
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/mix_format_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::MixFormat do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.ex file2.exs])
+  end
+
+  context 'when mix format exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when mix format exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return([
+          '** (Mix) mix format failed due to --check-formatted.',
+          'The following files are not formatted:',
+          '',
+          '  * lib/file1.ex',
+          '  * lib/file2.ex'
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From 774019a0b60c138ea229facf6e0fcaabf0336d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dino=20Kova=C4=8D?= <reisub@users.noreply.github.com>
Date: Mon, 19 Dec 2022 00:01:34 +0100
Subject: [PATCH 184/223] Add MixTest hook (#802)

---
 config/default.yml                            |  6 ++++
 lib/overcommit/hook/pre_push/mix_test.rb      | 16 ++++++++++
 .../overcommit/hook/pre_push/mix_test_spec.rb | 31 +++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 lib/overcommit/hook/pre_push/mix_test.rb
 create mode 100644 spec/overcommit/hook/pre_push/mix_test_spec.rb

diff --git a/config/default.yml b/config/default.yml
index 42ea17a8..181187af 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -1326,6 +1326,12 @@ PrePush:
     command: ['ruby', '-Ilib:test', '-rminitest', "-e 'exit! Minitest.run'"]
     include: 'test/**/*_test.rb'
 
+  MixTest:
+    enabled: false
+    description: 'Run mix test suite'
+    required_executable: 'mix'
+    flags: ['test']
+
   PhpUnit:
     enabled: false
     description: 'Run PhpUnit test suite'
diff --git a/lib/overcommit/hook/pre_push/mix_test.rb b/lib/overcommit/hook/pre_push/mix_test.rb
new file mode 100644
index 00000000..3ce005e9
--- /dev/null
+++ b/lib/overcommit/hook/pre_push/mix_test.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs `mix test` test suite before push
+  #
+  # @see https://hexdocs.pm/mix/Mix.Tasks.Test.html
+  class MixTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/mix_test_spec.rb b/spec/overcommit/hook/pre_push/mix_test_spec.rb
new file mode 100644
index 00000000..798da7f7
--- /dev/null
+++ b/spec/overcommit/hook/pre_push/mix_test_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PrePush::MixTest do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject       { described_class.new(config, context) }
+
+  context 'when mix test exits successfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+  end
+
+  context 'when mix test exits unsucessfully' do
+    before do
+      result = double('result')
+      result.stub(:success?).and_return(false)
+      result.stub(:stdout).and_return('Some error message')
+      result.stub(:stderr).and_return('')
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should fail_hook 'Some error message' }
+  end
+end

From 807de37897834c1083f19616860382d2c989a69c Mon Sep 17 00:00:00 2001
From: Julianna <julesros@users.noreply.github.com>
Date: Fri, 20 Jan 2023 00:40:46 -0600
Subject: [PATCH 185/223] Add optional additional local configuration (#799)

Adds support for an additional configuration file,
.local-overcommit.yml, in order to allow local configuration
on a local box. That way the main config .overcommit.yml can
be commited to a repo and a local developer can also add
configurations to this new file.
---
 README.md                                    |  4 ++
 lib/overcommit/configuration_loader.rb       | 16 ++++++--
 lib/overcommit/constants.rb                  |  1 +
 spec/overcommit/configuration_loader_spec.rb | 42 ++++++++++++++++++++
 4 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0464e604..afcbcbbf 100644
--- a/README.md
+++ b/README.md
@@ -208,6 +208,10 @@ PreCommit:
     command: ['bundle', 'exec', 'rubocop'] # Invoke within Bundler context
 ```
 
+Additionally, you may wish to have repo-specific configurations that are local to your computer that are not part of the shared repo config.
+Adding a `.local-overcommit.yml` file in the top-level directory of the repository adds another configuration file. This file works the same as `.overcommit.yml`.
+Adding this to ignored files in a git repo will allow you to have a local configuration per repo.
+
 ### Hook Options
 
 Individual hooks expose both built-in configuration options as well as their
diff --git a/lib/overcommit/configuration_loader.rb b/lib/overcommit/configuration_loader.rb
index 77a08549..e4063d7e 100644
--- a/lib/overcommit/configuration_loader.rb
+++ b/lib/overcommit/configuration_loader.rb
@@ -53,10 +53,14 @@ def initialize(logger, options = {})
     #
     # @return [Overcommit::Configuration]
     def load_repo_config
+      overcommit_local_yml = File.join(Overcommit::Utils.repo_root,
+                                       Overcommit::LOCAL_CONFIG_FILE_NAME)
       overcommit_yml = File.join(Overcommit::Utils.repo_root,
                                  Overcommit::CONFIG_FILE_NAME)
 
-      if File.exist?(overcommit_yml)
+      if File.exist?(overcommit_local_yml) && File.exist?(overcommit_yml)
+        load_file(overcommit_yml, overcommit_local_yml)
+      elsif File.exist?(overcommit_yml)
         load_file(overcommit_yml)
       else
         self.class.default_configuration
@@ -64,9 +68,13 @@ def load_repo_config
     end
 
     # Loads a configuration, ensuring it extends the default configuration.
-    def load_file(file)
-      config = self.class.load_from_file(file, default: false, logger: @log)
-      config = self.class.default_configuration.merge(config)
+    def load_file(file, local_file = nil)
+      overcommit_config = self.class.load_from_file(file, default: false, logger: @log)
+      if local_file
+        local_config = self.class.load_from_file(local_file, default: false, logger: @log)
+      end
+      config = self.class.default_configuration.merge(overcommit_config)
+      config = self.class.default_configuration.merge(local_config) if local_config
 
       if @options.fetch(:verify) { config.verify_signatures? }
         verify_signatures(config)
diff --git a/lib/overcommit/constants.rb b/lib/overcommit/constants.rb
index dd027932..e7c19728 100644
--- a/lib/overcommit/constants.rb
+++ b/lib/overcommit/constants.rb
@@ -4,6 +4,7 @@
 module Overcommit
   HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
   CONFIG_FILE_NAME = '.overcommit.yml'
+  LOCAL_CONFIG_FILE_NAME = '.local-overcommit.yml'
 
   HOOK_DIRECTORY = File.join(HOME, 'lib', 'overcommit', 'hook').freeze
 
diff --git a/spec/overcommit/configuration_loader_spec.rb b/spec/overcommit/configuration_loader_spec.rb
index a99608d4..2ddbe4e6 100644
--- a/spec/overcommit/configuration_loader_spec.rb
+++ b/spec/overcommit/configuration_loader_spec.rb
@@ -57,5 +57,47 @@
         end
       end
     end
+
+    context 'when repo contains a local configuration file' do
+      let(:config_contents) { <<-CFG }
+        plugin_directory: 'some-directory'
+      CFG
+
+      let(:local_config_contents) { <<-CFG }
+        plugin_directory: 'some-different-directory'
+      CFG
+
+      around do |example|
+        repo do
+          File.open('.overcommit.yml', 'w') { |f| f.write(config_contents) }
+          File.open('.local-overcommit.yml', 'w') { |f| f.write(local_config_contents) }
+          example.run
+        end
+      end
+
+      it 'loads the file' do
+        Overcommit::ConfigurationLoader.any_instance.
+          should_receive(:load_file).
+          with(File.expand_path('.overcommit.yml'), File.expand_path('.local-overcommit.yml'))
+        subject
+      end
+
+      it 'merges each loaded file with the default configuration' do
+        subject.plugin_directory.should == File.expand_path('some-different-directory')
+      end
+
+      context 'and the configuration file contains a hook with no `enabled` option' do
+        let(:config_contents) { <<-CFG }
+          PreCommit:
+            ScssLint:
+              command: ['bundle', 'exec', 'scss-lint']
+        CFG
+
+        it 'displays a warning' do
+          subject
+          output.string.should =~ /PreCommit::ScssLint.*not.*enabled/i
+        end
+      end
+    end
   end
 end

From 4d204bdb6ed8ef001ecd0175fb9de8b658cf04cc Mon Sep 17 00:00:00 2001
From: Kevin McCormack <harlemsquirrel@mccormack.tech>
Date: Fri, 20 Jan 2023 01:41:27 -0500
Subject: [PATCH 186/223] Rescue Psych::DisallowedClass in YamlSyntax (#805)

* Rescue Psych::DisallowedClass in YamlSyntax

This improves the output for errors safe loading disallowed classes with psych 5.0

* Remove extra whitespace
---
 lib/overcommit/hook/pre_commit/yaml_syntax.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/overcommit/hook/pre_commit/yaml_syntax.rb b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
index 493e9c5a..dd685450 100644
--- a/lib/overcommit/hook/pre_commit/yaml_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
@@ -15,10 +15,19 @@ def run
           rescue ArgumentError, Psych::SyntaxError => e
             messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
           end
+        rescue Psych::DisallowedClass => e
+          messages << error_message(file, e)
         end
       end
 
       messages
     end
+
+    private
+
+    def error_message(file, error)
+      text = "#{file}: #{error.message}"
+      Overcommit::Hook::Message.new(:error, file, nil, text)
+    end
   end
 end

From 8bc2eec0375bf2f75b7f39453713e8dec49ae679 Mon Sep 17 00:00:00 2001
From: Thomas Millward Wright <echinda@gmail.com>
Date: Fri, 20 Jan 2023 06:45:26 +0000
Subject: [PATCH 187/223] Add non ASCII encoding schema support to
 RailsSchemaUpToDate hook (#786)

* Add non ASCII encoding schema support to RailsSchemaUpToDate hook

* Add guard to check presence of @config['encoding']

Co-authored-by: Paul Wilson <paul.wilson@learnamp.com>
---
 .../pre_commit/rails_schema_up_to_date.rb     |  8 +++++-
 .../rails_schema_up_to_date_spec.rb           | 27 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
index 13d7932f..dafd31a1 100644
--- a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+++ b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
@@ -34,6 +34,12 @@ def run # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplex
 
     private
 
+    def encoding
+      return unless @config.key?('encoding')
+
+      { encoding: @config['encoding'] }.compact
+    end
+
     def migration_files
       @migration_files ||= applicable_files.select do |file|
         file.match %r{db/migrate/.*\.rb}
@@ -47,7 +53,7 @@ def schema_files
     end
 
     def schema
-      @schema ||= schema_files.map { |file| File.read(file) }.join
+      @schema ||= schema_files.map { |file| File.read(file, encoding) }.join
       @schema.tr('_', '')
     end
 
diff --git a/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb b/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb
index ad53485e..9ee704b7 100644
--- a/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb
+++ b/spec/overcommit/hook/pre_commit/rails_schema_up_to_date_spec.rb
@@ -70,6 +70,33 @@
     end
 
     it { should fail_hook }
+
+    context 'when non ASCII encoding is required' do
+      let!(:config) do
+        super().merge(Overcommit::Configuration.new(
+                        'PreCommit' => {
+                          'RailsSchemaUpToDate' => {
+                            'encoding' => 'utf-8'
+                          }
+                        }
+                      ))
+      end
+
+      before do
+        subject.stub(:applicable_files).and_return([sql_schema_file])
+      end
+
+      around do |example|
+        repo do
+          FileUtils.mkdir_p('db/migrate')
+          File.open(sql_schema_file, 'w') { |f| f.write("version: 12345678901234\nVALUES ('字')") }
+          `git add #{sql_schema_file}`
+          example.run
+        end
+      end
+
+      it { should fail_hook }
+    end
   end
 
   context 'when a Ruby schema file with the latest version and migrations are added' do

From 2214dd12f5dd6cd944a5c7a6c5a4ea25e2668349 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Thu, 19 Jan 2023 22:57:23 -0800
Subject: [PATCH 188/223] Cut version 0.60.0 (#807)

---
 CHANGELOG.md              | 10 ++++++++++
 lib/overcommit/version.rb |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa326ff2..ca3a52eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Overcommit Changelog
 
+## 0.60.0
+
+* Allow overriding `Gemfile.lock` location for `BundleCheck` pre-commit hook
+* Fix `ReplaceBranch` prepare-commit-msg hook to allow trailing spaces
+* Add `MixFormat` pre-commit hook
+* Add `MixTest` pre-push hook
+* Allow loading custom local configuration from `.local-overcommit.yml`
+* Handle `Psych::DisallowedClass` when running `YamlSyntax` pre-commit hook
+* Add support for specifying custom `encoding` in `RailsSchemaUpToDate` pre-commit hook
+
 ## 0.59.1
 
 * Remove `--disable-pending-cops` as default flag to `RuboCop` pre-commit hook.
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index e8f6bb39..0c03dd7f 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.59.1'
+  VERSION = '0.60.0'
 end

From 90e367940b87e3a22a4654ed536d20db2e380256 Mon Sep 17 00:00:00 2001
From: Linus Oleander <linus@oleander.io>
Date: Mon, 27 Mar 2023 19:28:19 +0200
Subject: [PATCH 189/223] Allow ReplaceBranch to use skip_if (#809)

* Allow ReplaceBranch to use skip_if

* Fix linting error

* Clearify specs

* Use bash instead of sh in spec
---
 .../hook/prepare_commit_msg/replace_branch.rb |  2 +-
 .../prepare_commit_msg/replace_branch_spec.rb | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
index e8c09887..8852b0b5 100644
--- a/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
+++ b/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
@@ -85,7 +85,7 @@ def skipped_commit_types
     end
 
     def skip?
-      skipped_commit_types.include?(commit_message_source)
+      super || skipped_commit_types.include?(commit_message_source)
     end
   end
 end
diff --git a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
index 6af27921..e355517f 100644
--- a/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/replace_branch_spec.rb
@@ -70,6 +70,26 @@ def remove_file(name)
           expect(File.read('COMMIT_EDITMSG')).to eq("[123] \n")
         end
       end
+
+      context 'when skip_if exits with a zero status' do
+        let(:config) { new_config('skip_if' => ['bash', '-c', 'exit 0']) }
+
+        it { is_expected.to pass }
+
+        it 'does not change the commit message' do
+          expect(File.read('COMMIT_EDITMSG')).to eq("\n")
+        end
+      end
+
+      context 'when skip_if exits with a non-zero status' do
+        let(:config) { new_config('skip_if' => ['bash', '-c', 'exit 1']) }
+
+        it { is_expected.to pass }
+
+        it 'does change the commit message' do
+          expect(File.read('COMMIT_EDITMSG')).to eq("[#123]\n")
+        end
+      end
     end
 
     context "when the checked out branch doesn't matches the pattern" do

From 02f7b3ef2d455fff46cb6d5a0877a5193bc769c9 Mon Sep 17 00:00:00 2001
From: Julianna <julesros@users.noreply.github.com>
Date: Wed, 13 Dec 2023 01:05:04 -0600
Subject: [PATCH 190/223] fix: local overcommit file merges with existing
 .overcommit.yml file (#815)

---
 lib/overcommit/configuration_loader.rb       |  6 +-
 spec/overcommit/configuration_loader_spec.rb | 62 ++++++++++++++------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/lib/overcommit/configuration_loader.rb b/lib/overcommit/configuration_loader.rb
index e4063d7e..8fd68a01 100644
--- a/lib/overcommit/configuration_loader.rb
+++ b/lib/overcommit/configuration_loader.rb
@@ -70,11 +70,9 @@ def load_repo_config
     # Loads a configuration, ensuring it extends the default configuration.
     def load_file(file, local_file = nil)
       overcommit_config = self.class.load_from_file(file, default: false, logger: @log)
-      if local_file
-        local_config = self.class.load_from_file(local_file, default: false, logger: @log)
-      end
+      l_config = self.class.load_from_file(local_file, default: false, logger: @log) if local_file
       config = self.class.default_configuration.merge(overcommit_config)
-      config = self.class.default_configuration.merge(local_config) if local_config
+      config = config.merge(l_config) if l_config
 
       if @options.fetch(:verify) { config.verify_signatures? }
         verify_signatures(config)
diff --git a/spec/overcommit/configuration_loader_spec.rb b/spec/overcommit/configuration_loader_spec.rb
index 2ddbe4e6..90497201 100644
--- a/spec/overcommit/configuration_loader_spec.rb
+++ b/spec/overcommit/configuration_loader_spec.rb
@@ -58,11 +58,32 @@
       end
     end
 
-    context 'when repo contains a local configuration file' do
+    context 'when repo only contains a repo level configuration file' do
       let(:config_contents) { <<-CFG }
-        plugin_directory: 'some-directory'
+        PreCommit:
+          Rubocop:
+            enabled: true
       CFG
 
+      around do |example|
+        repo do
+          File.open('.overcommit.yml', 'w') { |f| f.write(config_contents) }
+          example.run
+        end
+      end
+
+      it 'includes default settings' do
+        subject
+        subject.for_hook('CapitalizedSubject', 'CommitMsg').should include('enabled' => true)
+      end
+
+      it 'includes .overwrite.yml configs' do
+        subject
+        subject.for_hook('Rubocop', 'PreCommit').should include('enabled' => true)
+      end
+    end
+
+    context 'when repo also contains a local configuration file' do
       let(:local_config_contents) { <<-CFG }
         plugin_directory: 'some-different-directory'
       CFG
@@ -75,28 +96,31 @@
         end
       end
 
-      it 'loads the file' do
-        Overcommit::ConfigurationLoader.any_instance.
-          should_receive(:load_file).
-          with(File.expand_path('.overcommit.yml'), File.expand_path('.local-overcommit.yml'))
+      let(:config_contents) { <<-CFG }
+        PreCommit:
+          ScssLint:
+            enabled: true
+      CFG
+
+      let(:local_config_contents) { <<-CFG }
+        PreCommit:
+          Rubocop:
+            enabled: true
+      CFG
+
+      it 'includes default settings' do
         subject
+        subject.for_hook('CapitalizedSubject', 'CommitMsg').should include('enabled' => true)
       end
 
-      it 'merges each loaded file with the default configuration' do
-        subject.plugin_directory.should == File.expand_path('some-different-directory')
+      it 'includes .overwrite.yml configs' do
+        subject
+        subject.for_hook('ScssLint', 'PreCommit').should include('enabled' => true)
       end
 
-      context 'and the configuration file contains a hook with no `enabled` option' do
-        let(:config_contents) { <<-CFG }
-          PreCommit:
-            ScssLint:
-              command: ['bundle', 'exec', 'scss-lint']
-        CFG
-
-        it 'displays a warning' do
-          subject
-          output.string.should =~ /PreCommit::ScssLint.*not.*enabled/i
-        end
+      it 'includes .local-overwrite.yml configs' do
+        subject
+        subject.for_hook('Rubocop', 'PreCommit').should include('enabled' => true)
       end
     end
   end

From 38febfc1d798a5220d97c58307a8621e8d427258 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 12 Dec 2023 23:09:05 -0800
Subject: [PATCH 191/223] Cut version 0.61.0 (#817)

---
 CHANGELOG.md              | 5 +++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca3a52eb..cc14f3f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## 0.61.0
+
+* Allow `ReplaceBranch` to use `skip_if`
+* Fix local Overcommit file merges with existing `.overcommit.yml`
+
 ## 0.60.0
 
 * Allow overriding `Gemfile.lock` location for `BundleCheck` pre-commit hook
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 0c03dd7f..0646ce48 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.60.0'
+  VERSION = '0.61.0'
 end

From 4f11048e99134ea0e4128d7ad6694f3b230d88f1 Mon Sep 17 00:00:00 2001
From: Denis Zaratan Pasin <zaratan@hey.com>
Date: Wed, 13 Dec 2023 08:11:36 +0100
Subject: [PATCH 192/223] Adding Ruby 3.2 to test matrix (#816)

---
 .github/workflows/tests.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 848db60c..416afe34 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,6 +18,7 @@ jobs:
           - '2.7'
           - '3.0'
           - '3.1'
+          - '3.2'
         os:
           - ubuntu
           - windows
@@ -27,6 +28,8 @@ jobs:
         exclude:
           - ruby-version: '3.1'
             os: windows
+          - ruby-version: '3.2'
+            os: windows
 
     steps:
       - uses: actions/checkout@v2

From faf76fc7aa01c2b3264020ed301b569a9ed53360 Mon Sep 17 00:00:00 2001
From: Andy Waite <13400+andyw8@users.noreply.github.com>
Date: Sun, 14 Jan 2024 21:06:39 -0500
Subject: [PATCH 193/223] Update RuboCop (#818)

The current version of Ruby is from April 2020. Since there are quite a
lot of new issues identified, I've committed them to the
`.rubocop_todo.yml` so that they can be addressed incrementally or
disabled.

Co-authored-by: Andy Waite <andyw8@users.noreply.github.com>
---
 .rubocop.yml                                  |   2 +
 .rubocop_todo.yml                             | 137 ++++++++++++++++++
 Gemfile                                       |   4 +-
 .../hook/pre_commit/phpcs_fixer_spec.rb       |  12 +-
 4 files changed, 147 insertions(+), 8 deletions(-)
 create mode 100644 .rubocop_todo.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 35002594..8c779097 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 2.4
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 00000000..53df9159
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,137 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit`
+# on 2024-01-10 14:09:00 UTC using RuboCop version 1.59.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowAliasSyntax, AllowedMethods.
+# AllowedMethods: alias_method, public, protected, private
+Layout/EmptyLinesAroundAttributeAccessor:
+  Exclude:
+    - 'lib/overcommit/hook_context/post_merge.rb'
+
+# Offense count: 6
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'spec/overcommit/message_processor_spec.rb'
+
+# Offense count: 4
+Lint/MixedRegexpCaptureTypes:
+  Exclude:
+    - 'lib/overcommit/hook/pre_commit/dart_analyzer.rb'
+    - 'lib/overcommit/hook/pre_commit/java_checkstyle.rb'
+    - 'lib/overcommit/hook/pre_commit/kt_lint.rb'
+    - 'lib/overcommit/hook/pre_commit/scalastyle.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/overcommit/hook_runner.rb'
+    - 'lib/overcommit/printer.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, Max, CountAsOne.
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/overcommit/utils.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/overcommit/configuration.rb'
+    - 'lib/overcommit/hook_runner.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns, Max.
+Metrics/PerceivedComplexity:
+  Exclude:
+    - 'lib/overcommit/configuration.rb'
+    - 'lib/overcommit/configuration_validator.rb'
+    - 'lib/overcommit/hook_runner.rb'
+
+# Offense count: 23
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - 'bin/overcommit'
+    - 'lib/overcommit/hook/post_commit/git_guilt.rb'
+    - 'template-dir/hooks/commit-msg'
+    - 'template-dir/hooks/overcommit-hook'
+    - 'template-dir/hooks/post-checkout'
+    - 'template-dir/hooks/post-commit'
+    - 'template-dir/hooks/post-merge'
+    - 'template-dir/hooks/post-rewrite'
+    - 'template-dir/hooks/pre-commit'
+    - 'template-dir/hooks/pre-push'
+    - 'template-dir/hooks/pre-rebase'
+    - 'template-dir/hooks/prepare-commit-msg'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/HashTransformValues:
+  Exclude:
+    - 'lib/overcommit/configuration.rb'
+    - 'lib/overcommit/configuration_validator.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/overcommit/logger.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantBegin:
+  Exclude:
+    - 'lib/overcommit/hook/prepare_commit_msg/replace_branch.rb'
+    - 'lib/overcommit/utils.rb'
+
+# Offense count: 10
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: SafeForConstants.
+Style/RedundantFetchBlock:
+  Exclude:
+    - 'lib/overcommit/configuration.rb'
+    - 'lib/overcommit/configuration_validator.rb'
+    - 'lib/overcommit/hook/base.rb'
+    - 'lib/overcommit/hook/pre_commit/chamber_verification.rb'
+    - 'lib/overcommit/logger.rb'
+    - 'spec/support/shell_helpers.rb'
+
+# Offense count: 8
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/overcommit/configuration.rb'
+    - 'lib/overcommit/hook/pre_commit/php_cs.rb'
+    - 'lib/overcommit/hook/pre_commit/php_lint.rb'
+    - 'lib/overcommit/hook/pre_commit/php_stan.rb'
+
+# Offense count: 15
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/overcommit/hook/pre_commit/bundle_check.rb'
+    - 'lib/overcommit/hook_runner.rb'
+    - 'lib/overcommit/message_processor.rb'
+    - 'spec/integration/gemfile_option_spec.rb'
+    - 'spec/overcommit/hook/commit_msg/text_width_spec.rb'
+    - 'spec/overcommit/hook/prepare_commit_msg/base_spec.rb'
+    - 'spec/overcommit/message_processor_spec.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/ZeroLengthPredicate:
+  Exclude:
+    - 'lib/overcommit/hook/pre_commit/ruby_syntax.rb'
diff --git a/Gemfile b/Gemfile
index ff22be0c..53b13c7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'rspec', '~> 3.0'
 gem 'simplecov', '~> 0.21.0'
 gem 'simplecov-lcov', '~> 0.8.0'
 
-# Pin RuboCop for Travis builds.
-gem 'rubocop', '0.82.0'
+# Pin RuboCop for CI builds
+gem 'rubocop', '1.59.0'
 
 gem 'ffi' if Gem.win_platform?
diff --git a/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb b/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb
index 33b0d7c1..a4b1e187 100644
--- a/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb
+++ b/spec/overcommit/hook/pre_commit/phpcs_fixer_spec.rb
@@ -13,7 +13,7 @@
 
   context 'when phpcs fixer exits successfully with fixed file' do
     before do
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       sample_output = [
         'Loaded config default.',
         'Using cache file ".php_cs.cache".',
@@ -24,7 +24,7 @@
         'Fixed all files in 0.001 seconds, 10.000 MB memory used',
         '',
       ].join("\n")
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       result = double('result')
       result.stub(:status).and_return(0)
@@ -38,7 +38,7 @@
 
   context 'when phpcs fixer exits successfully with no file to fix' do
     before do
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       sample_output = [
         'Loaded config default.',
         'Using cache file ".php_cs.cache".',
@@ -46,7 +46,7 @@
         'Legend: ?-unknown, I-invalid file syntax, file ignored, S-Skipped, .-no changes, F-fixed, E-error',
         '',
       ].join("\n")
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       result = double('result')
       result.stub(:status).and_return(0)
@@ -60,7 +60,7 @@
 
   context 'when phpcs exits unsuccessfully' do
     before do
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       sample_output = [
         'Loaded config default.',
         'Using cache file ".php_cs.cache".',
@@ -72,7 +72,7 @@
         '   1) /home/damien/Code/Rezdy/php/foo/broken.php',
         '',
       ].join("\n")
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       result = double('result')
       result.stub(:status).and_return(1)

From bc1fec660e5c7c0cd83e2c8b3de8f02b55c0b367 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 14 Jan 2024 18:17:08 -0800
Subject: [PATCH 194/223] Update branch for CI from `master` to `main` (#819)

This was missed when we switched to using `main`.
---
 .github/workflows/lint.yml  | 6 +++---
 .github/workflows/tests.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index b1879f09..8b23cbab 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,9 +1,9 @@
 name: Lint
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   overcommit:
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.3
           bundler-cache: true
 
       - name: Prepare environment
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 416afe34..26c20dd1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,9 +1,9 @@
 name: Tests
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   rspec:

From 2dd1eb9e3fbaaf3693b9a32414fb8cf7706c9db9 Mon Sep 17 00:00:00 2001
From: Patrik Ragnarsson <patrik@starkast.net>
Date: Wed, 17 Jan 2024 00:02:11 +0100
Subject: [PATCH 195/223] Allow childprocess 5 (#820)

I think it only brings improvements:
https://github.com/enkessler/childprocess/releases/tag/v5.0.0
---
 overcommit.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/overcommit.gemspec b/overcommit.gemspec
index ef9f24fc..8bc70845 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4'
 
-  s.add_dependency          'childprocess', '>= 0.6.3', '< 5'
+  s.add_dependency          'childprocess', '>= 0.6.3', '< 6'
   s.add_dependency          'iniparse', '~> 1.4'
   s.add_dependency          'rexml', '~> 3.2'
 end

From f190f24b748ba04ed5199c9ac8ca12557237800c Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Tue, 16 Jan 2024 15:05:50 -0800
Subject: [PATCH 196/223] Cut version 0.62.0 (#821)

---
 CHANGELOG.md              | 4 ++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc14f3f1..5953a7c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## 0.62.0
+
+* Allow version 5 of `childprocess` gem dependency
+
 ## 0.61.0
 
 * Allow `ReplaceBranch` to use `skip_if`
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 0646ce48..f6805668 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.61.0'
+  VERSION = '0.62.0'
 end

From 607ce057b760b697dc63623e7b7dc06a79316eab Mon Sep 17 00:00:00 2001
From: benmelz <ben.j.melz@gmail.com>
Date: Sat, 24 Feb 2024 18:50:30 -0500
Subject: [PATCH 197/223] Get suite running smoothly again (#824)

Am planning on proposing/implementing a new feature, but first I noticed
that there are a number of failing specs on main, so I figured I would
start with that.

As written, this includes four main adjustments, two of which might
actually be bugfixes:
- one spec was hanging indefinitely for me locally on a `Thread.join`
call - explicitly capturing the child threads and joining them directly
fixed it (might be machine dependent?)
- when an encoding is specified, the rails schema up to date hook was
passing arguments incorrectly (kwarg containing `encoding` was being
interpreted as the `length` positional arg) (possible bug)
- many specs were attempting to create file submodules without the
`protocol.file.allow=always` config option causing failure
- alias detection for amendment appeared to be broken, due to regexp
incompatibilities between ruby/git (git wasn't properly parsing `\s` in
the value matcher for `git config --regexp [key] [value]` command), so
moved that matching into ruby (possible bug, also maybe machine/git
build opt dependent)
- dropped ruby 2.6 from the test matrix - it appears that it's far
enough EOL that github has trouble even setting it up. I can attempt to
add it back/get it working, but I figured it might be time to ditch it

*I don't have a windows machine, so I'm not gonna be much help with
those CI builds (should note fails appear unrelated to anything I've
done here).
---
 .github/workflows/tests.yml                   |  1 -
 .../pre_commit/rails_schema_up_to_date.rb     |  4 +--
 .../helpers/file_modifications.rb             | 31 ++++++++++++-------
 spec/overcommit/git_repo_spec.rb              | 22 +++++++------
 .../hook/prepare_commit_msg/base_spec.rb      |  4 +--
 .../hook_context/commit_msg_spec.rb           | 10 +++---
 .../hook_context/post_checkout_spec.rb        |  2 +-
 .../hook_context/post_commit_spec.rb          |  2 +-
 .../hook_context/post_merge_spec.rb           |  2 +-
 .../hook_context/post_rewrite_spec.rb         |  3 +-
 .../hook_context/pre_commit_spec.rb           | 10 +++---
 spec/overcommit/hook_context/run_all_spec.rb  |  3 +-
 spec/overcommit/installer_spec.rb             |  2 +-
 13 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 26c20dd1..71a83ba6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,7 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
diff --git a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
index dafd31a1..1f2de970 100644
--- a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+++ b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
@@ -35,7 +35,7 @@ def run # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplex
     private
 
     def encoding
-      return unless @config.key?('encoding')
+      return {} unless @config.key?('encoding')
 
       { encoding: @config['encoding'] }.compact
     end
@@ -53,7 +53,7 @@ def schema_files
     end
 
     def schema
-      @schema ||= schema_files.map { |file| File.read(file, encoding) }.join
+      @schema ||= schema_files.map { |file| File.read(file, **encoding) }.join
       @schema.tr('_', '')
     end
 
diff --git a/lib/overcommit/hook_context/helpers/file_modifications.rb b/lib/overcommit/hook_context/helpers/file_modifications.rb
index 00aaccc8..8d221ddc 100644
--- a/lib/overcommit/hook_context/helpers/file_modifications.rb
+++ b/lib/overcommit/hook_context/helpers/file_modifications.rb
@@ -12,7 +12,7 @@ def amendment?
         cmd = Overcommit::Utils.parent_command
         return unless cmd
 
-        amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
+        amend_pattern = /commit(\s.*)?\s--amend/
 
         # Since the ps command can return invalid byte sequences for commands
         # containing unicode characters, we replace the offending characters,
@@ -24,18 +24,11 @@ def amendment?
             encode('UTF-8')
         end
 
-        return @amendment if
-          # True if the command is a commit with the --amend flag
-          @amendment = !(/\s#{amend_pattern}/ =~ cmd).nil?
+        # True if the command is a commit with the --amend flag
+        return @amendment if @amendment = cmd.match?(amend_pattern)
 
         # Check for git aliases that call `commit --amend`
-        `git config --get-regexp "^alias\\." "#{amend_pattern}"`.
-          scan(/alias\.([-\w]+)/). # Extract the alias
-          each do |match|
-            return @amendment if
-              # True if the command uses a git alias for `commit --amend`
-              @amendment = !(/git(\.exe)?\s+#{match[0]}/ =~ cmd).nil?
-          end
+        return @amendment if @amendment = command_is_amend_alias?(cmd, amend_pattern)
 
         @amendment
       end
@@ -74,6 +67,22 @@ def modified_lines_in_file(file)
         end
         @modified_lines[file]
       end
+
+      private
+
+      def command_is_amend_alias?(cmd, amend_pattern)
+        `git config --get-regexp "^alias"`.split("\n").each do |alias_def|
+          alias_map = alias_def.match /alias\.(?<to>[-\w]+)\s+(?<from>.+)/
+          next unless alias_map
+
+          alias_from_match = alias_map[:from].match? amend_pattern
+          alias_to_match = cmd.match? /git(\.exe)?\s+#{alias_map[:to]}/
+
+          # True if the command uses a git alias for `commit --amend`
+          return true if @amendment = alias_from_match && alias_to_match
+        end
+        false
+      end
     end
   end
 end
diff --git a/spec/overcommit/git_repo_spec.rb b/spec/overcommit/git_repo_spec.rb
index 128737c3..08f3b585 100644
--- a/spec/overcommit/git_repo_spec.rb
+++ b/spec/overcommit/git_repo_spec.rb
@@ -24,12 +24,13 @@
         end
 
         submodule = repo do
-          `git submodule add #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
+          git_config = '-c protocol.file.allow=always'
+          `git #{git_config} submodule add #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
           `git commit -m "Add nested submodule"`
         end
 
         repo do
-          `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
           example.run
         end
       end
@@ -150,7 +151,7 @@
         end
 
         before do
-          `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
         end
 
         it { should_not include File.expand_path('sub') }
@@ -178,7 +179,8 @@
           `git commit --allow-empty -m "Submodule commit"`
         end
 
-        `git submodule add #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
+        git_config = '-c protocol.file.allow=always'
+        `git #{git_config} submodule add #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
       end
 
@@ -282,7 +284,7 @@
         touch 'tracked'
         `git add tracked`
         `git commit -m "Initial commit"`
-        `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
         touch 'staged'
         `git add staged`
         example.run
@@ -327,7 +329,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
         `git commit -m "Initial commit"`
         example.run
       end
@@ -343,7 +345,8 @@
           `git commit --allow-empty -m "Another submodule"`
         end
 
-        `git submodule add #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
+        git_config = '-c protocol.file.allow=always'
+        `git #{git_config} submodule add #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
       end
 
       it { should be_empty }
@@ -365,11 +368,12 @@
 
     context 'when there are multiple submodule removals staged' do
       before do
-        another_submodule = repo do
+        another_submod = repo do
           `git commit --allow-empty -m "Another submodule"`
         end
 
-        `git submodule add #{another_submodule} yet-another-sub-repo 2>&1 > #{File::NULL}`
+        git_conf = '-c protocol.file.allow=always'
+        `git #{git_conf} submodule add #{another_submod} yet-another-sub-repo 2>&1 > #{File::NULL}`
         `git commit -m "Add yet another submodule"`
         `git rm sub-repo`
         `git rm yet-another-sub-repo`
diff --git a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
index 616d6b8e..ef635a48 100644
--- a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
@@ -38,9 +38,7 @@
           contents + "bravo\n"
         end
       end
-      Thread.new { hook_1.run }
-      Thread.new { hook_2.run }
-      Thread.list.each { |t| t.join unless t == Thread.current }
+      [Thread.new { hook_1.run }, Thread.new { hook_2.run }].each(&:join)
       expect(File.read(tempfile)).to match(/alpha\n#{initial_content}bravo\n/m)
     end
   end
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb
index 2aa68516..058f1508 100644
--- a/spec/overcommit/hook_context/commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/commit_msg_spec.rb
@@ -298,7 +298,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -474,7 +474,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -500,7 +500,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -532,7 +532,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           `git rm sub`
           example.run
@@ -561,7 +561,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         expect(subject).to_not include File.expand_path('test-sub')
       end
     end
diff --git a/spec/overcommit/hook_context/post_checkout_spec.rb b/spec/overcommit/hook_context/post_checkout_spec.rb
index 50657c37..df1dccd2 100644
--- a/spec/overcommit/hook_context/post_checkout_spec.rb
+++ b/spec/overcommit/hook_context/post_checkout_spec.rb
@@ -67,7 +67,7 @@
 
       repo do
         `git commit --allow-empty -m "Initial commit"`
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
         expect(subject).to_not include File.expand_path('test-sub')
       end
diff --git a/spec/overcommit/hook_context/post_commit_spec.rb b/spec/overcommit/hook_context/post_commit_spec.rb
index 81758256..5322a1f2 100644
--- a/spec/overcommit/hook_context/post_commit_spec.rb
+++ b/spec/overcommit/hook_context/post_commit_spec.rb
@@ -20,7 +20,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         `git commit -m "Initial commit"`
         expect(subject).to_not include File.expand_path('test-sub')
       end
diff --git a/spec/overcommit/hook_context/post_merge_spec.rb b/spec/overcommit/hook_context/post_merge_spec.rb
index aa89fa82..0621b695 100644
--- a/spec/overcommit/hook_context/post_merge_spec.rb
+++ b/spec/overcommit/hook_context/post_merge_spec.rb
@@ -94,7 +94,7 @@
       repo do
         `git commit --allow-empty -m "Initial commit"`
         `git checkout -b child > #{File::NULL} 2>&1`
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
         `git checkout master > #{File::NULL} 2>&1`
         `git merge --no-ff --no-edit child`
diff --git a/spec/overcommit/hook_context/post_rewrite_spec.rb b/spec/overcommit/hook_context/post_rewrite_spec.rb
index d2f18f6e..0d510c4a 100644
--- a/spec/overcommit/hook_context/post_rewrite_spec.rb
+++ b/spec/overcommit/hook_context/post_rewrite_spec.rb
@@ -101,8 +101,9 @@
         end
 
         repo do
+          git_config = '-c protocol.file.allow=always'
           `git commit --allow-empty -m "Initial commit"`
-          `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+          `git #{git_config} submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
           `git commit --amend -m "Add submodule"`
           expect(subject).to_not include File.expand_path('test-sub')
         end
diff --git a/spec/overcommit/hook_context/pre_commit_spec.rb b/spec/overcommit/hook_context/pre_commit_spec.rb
index dae42e66..719982a1 100644
--- a/spec/overcommit/hook_context/pre_commit_spec.rb
+++ b/spec/overcommit/hook_context/pre_commit_spec.rb
@@ -207,7 +207,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -383,7 +383,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -409,7 +409,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -441,7 +441,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           `git rm sub`
           example.run
@@ -470,7 +470,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         expect(subject).to_not include File.expand_path('test-sub')
       end
     end
diff --git a/spec/overcommit/hook_context/run_all_spec.rb b/spec/overcommit/hook_context/run_all_spec.rb
index 516fb70b..c6696edc 100644
--- a/spec/overcommit/hook_context/run_all_spec.rb
+++ b/spec/overcommit/hook_context/run_all_spec.rb
@@ -46,7 +46,8 @@
         end
 
         repo do
-          `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+          git_config = '-c protocol.file.allow=always'
+          `git #{git_config} submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
           example.run
         end
       end
diff --git a/spec/overcommit/installer_spec.rb b/spec/overcommit/installer_spec.rb
index c7cfb05e..8739a70e 100644
--- a/spec/overcommit/installer_spec.rb
+++ b/spec/overcommit/installer_spec.rb
@@ -231,7 +231,7 @@ def hook_files_installed?(hooks_dir)
       context 'which has an external git dir' do
         let(:submodule) { File.join(target, 'submodule') }
         before do
-          system 'git', 'submodule', 'add', target, 'submodule',
+          system 'git', '-c', 'protocol.file.allow=always', 'submodule', 'add', target, 'submodule',
                  chdir: target, out: :close, err: :close
         end
         let(:submodule_git_file) { File.join(submodule, '.git') }

From 65e211451816710afe3b530d2e319db08f2c2f1b Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 24 Feb 2024 15:57:56 -0800
Subject: [PATCH 198/223] Revert "Get suite running smoothly again (#824)"
 (#840)

This reverts commit 607ce057b760b697dc63623e7b7dc06a79316eab.

Going to try to merge a different branch.
---
 .github/workflows/tests.yml                   |  1 +
 .../pre_commit/rails_schema_up_to_date.rb     |  4 +--
 .../helpers/file_modifications.rb             | 31 +++++++------------
 spec/overcommit/git_repo_spec.rb              | 22 ++++++-------
 .../hook/prepare_commit_msg/base_spec.rb      |  4 ++-
 .../hook_context/commit_msg_spec.rb           | 10 +++---
 .../hook_context/post_checkout_spec.rb        |  2 +-
 .../hook_context/post_commit_spec.rb          |  2 +-
 .../hook_context/post_merge_spec.rb           |  2 +-
 .../hook_context/post_rewrite_spec.rb         |  3 +-
 .../hook_context/pre_commit_spec.rb           | 10 +++---
 spec/overcommit/hook_context/run_all_spec.rb  |  3 +-
 spec/overcommit/installer_spec.rb             |  2 +-
 13 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 71a83ba6..26c20dd1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,6 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
+          - '2.6'
           - '2.7'
           - '3.0'
           - '3.1'
diff --git a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
index 1f2de970..dafd31a1 100644
--- a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+++ b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
@@ -35,7 +35,7 @@ def run # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplex
     private
 
     def encoding
-      return {} unless @config.key?('encoding')
+      return unless @config.key?('encoding')
 
       { encoding: @config['encoding'] }.compact
     end
@@ -53,7 +53,7 @@ def schema_files
     end
 
     def schema
-      @schema ||= schema_files.map { |file| File.read(file, **encoding) }.join
+      @schema ||= schema_files.map { |file| File.read(file, encoding) }.join
       @schema.tr('_', '')
     end
 
diff --git a/lib/overcommit/hook_context/helpers/file_modifications.rb b/lib/overcommit/hook_context/helpers/file_modifications.rb
index 8d221ddc..00aaccc8 100644
--- a/lib/overcommit/hook_context/helpers/file_modifications.rb
+++ b/lib/overcommit/hook_context/helpers/file_modifications.rb
@@ -12,7 +12,7 @@ def amendment?
         cmd = Overcommit::Utils.parent_command
         return unless cmd
 
-        amend_pattern = /commit(\s.*)?\s--amend/
+        amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
 
         # Since the ps command can return invalid byte sequences for commands
         # containing unicode characters, we replace the offending characters,
@@ -24,11 +24,18 @@ def amendment?
             encode('UTF-8')
         end
 
-        # True if the command is a commit with the --amend flag
-        return @amendment if @amendment = cmd.match?(amend_pattern)
+        return @amendment if
+          # True if the command is a commit with the --amend flag
+          @amendment = !(/\s#{amend_pattern}/ =~ cmd).nil?
 
         # Check for git aliases that call `commit --amend`
-        return @amendment if @amendment = command_is_amend_alias?(cmd, amend_pattern)
+        `git config --get-regexp "^alias\\." "#{amend_pattern}"`.
+          scan(/alias\.([-\w]+)/). # Extract the alias
+          each do |match|
+            return @amendment if
+              # True if the command uses a git alias for `commit --amend`
+              @amendment = !(/git(\.exe)?\s+#{match[0]}/ =~ cmd).nil?
+          end
 
         @amendment
       end
@@ -67,22 +74,6 @@ def modified_lines_in_file(file)
         end
         @modified_lines[file]
       end
-
-      private
-
-      def command_is_amend_alias?(cmd, amend_pattern)
-        `git config --get-regexp "^alias"`.split("\n").each do |alias_def|
-          alias_map = alias_def.match /alias\.(?<to>[-\w]+)\s+(?<from>.+)/
-          next unless alias_map
-
-          alias_from_match = alias_map[:from].match? amend_pattern
-          alias_to_match = cmd.match? /git(\.exe)?\s+#{alias_map[:to]}/
-
-          # True if the command uses a git alias for `commit --amend`
-          return true if @amendment = alias_from_match && alias_to_match
-        end
-        false
-      end
     end
   end
 end
diff --git a/spec/overcommit/git_repo_spec.rb b/spec/overcommit/git_repo_spec.rb
index 08f3b585..128737c3 100644
--- a/spec/overcommit/git_repo_spec.rb
+++ b/spec/overcommit/git_repo_spec.rb
@@ -24,13 +24,12 @@
         end
 
         submodule = repo do
-          git_config = '-c protocol.file.allow=always'
-          `git #{git_config} submodule add #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
+          `git submodule add #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
           `git commit -m "Add nested submodule"`
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+          `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
           example.run
         end
       end
@@ -151,7 +150,7 @@
         end
 
         before do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+          `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
         end
 
         it { should_not include File.expand_path('sub') }
@@ -179,8 +178,7 @@
           `git commit --allow-empty -m "Submodule commit"`
         end
 
-        git_config = '-c protocol.file.allow=always'
-        `git #{git_config} submodule add #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
       end
 
@@ -284,7 +282,7 @@
         touch 'tracked'
         `git add tracked`
         `git commit -m "Initial commit"`
-        `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
         touch 'staged'
         `git add staged`
         example.run
@@ -329,7 +327,7 @@
       end
 
       repo do
-        `git -c protocol.file.allow=always submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
         `git commit -m "Initial commit"`
         example.run
       end
@@ -345,8 +343,7 @@
           `git commit --allow-empty -m "Another submodule"`
         end
 
-        git_config = '-c protocol.file.allow=always'
-        `git #{git_config} submodule add #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
+        `git submodule add #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
       end
 
       it { should be_empty }
@@ -368,12 +365,11 @@
 
     context 'when there are multiple submodule removals staged' do
       before do
-        another_submod = repo do
+        another_submodule = repo do
           `git commit --allow-empty -m "Another submodule"`
         end
 
-        git_conf = '-c protocol.file.allow=always'
-        `git #{git_conf} submodule add #{another_submod} yet-another-sub-repo 2>&1 > #{File::NULL}`
+        `git submodule add #{another_submodule} yet-another-sub-repo 2>&1 > #{File::NULL}`
         `git commit -m "Add yet another submodule"`
         `git rm sub-repo`
         `git rm yet-another-sub-repo`
diff --git a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
index ef635a48..616d6b8e 100644
--- a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
@@ -38,7 +38,9 @@
           contents + "bravo\n"
         end
       end
-      [Thread.new { hook_1.run }, Thread.new { hook_2.run }].each(&:join)
+      Thread.new { hook_1.run }
+      Thread.new { hook_2.run }
+      Thread.list.each { |t| t.join unless t == Thread.current }
       expect(File.read(tempfile)).to match(/alpha\n#{initial_content}bravo\n/m)
     end
   end
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb
index 058f1508..2aa68516 100644
--- a/spec/overcommit/hook_context/commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/commit_msg_spec.rb
@@ -298,7 +298,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -474,7 +474,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -500,7 +500,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -532,7 +532,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           `git rm sub`
           example.run
@@ -561,7 +561,7 @@
       end
 
       repo do
-        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         expect(subject).to_not include File.expand_path('test-sub')
       end
     end
diff --git a/spec/overcommit/hook_context/post_checkout_spec.rb b/spec/overcommit/hook_context/post_checkout_spec.rb
index df1dccd2..50657c37 100644
--- a/spec/overcommit/hook_context/post_checkout_spec.rb
+++ b/spec/overcommit/hook_context/post_checkout_spec.rb
@@ -67,7 +67,7 @@
 
       repo do
         `git commit --allow-empty -m "Initial commit"`
-        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
         expect(subject).to_not include File.expand_path('test-sub')
       end
diff --git a/spec/overcommit/hook_context/post_commit_spec.rb b/spec/overcommit/hook_context/post_commit_spec.rb
index 5322a1f2..81758256 100644
--- a/spec/overcommit/hook_context/post_commit_spec.rb
+++ b/spec/overcommit/hook_context/post_commit_spec.rb
@@ -20,7 +20,7 @@
       end
 
       repo do
-        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         `git commit -m "Initial commit"`
         expect(subject).to_not include File.expand_path('test-sub')
       end
diff --git a/spec/overcommit/hook_context/post_merge_spec.rb b/spec/overcommit/hook_context/post_merge_spec.rb
index 0621b695..aa89fa82 100644
--- a/spec/overcommit/hook_context/post_merge_spec.rb
+++ b/spec/overcommit/hook_context/post_merge_spec.rb
@@ -94,7 +94,7 @@
       repo do
         `git commit --allow-empty -m "Initial commit"`
         `git checkout -b child > #{File::NULL} 2>&1`
-        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
         `git checkout master > #{File::NULL} 2>&1`
         `git merge --no-ff --no-edit child`
diff --git a/spec/overcommit/hook_context/post_rewrite_spec.rb b/spec/overcommit/hook_context/post_rewrite_spec.rb
index 0d510c4a..d2f18f6e 100644
--- a/spec/overcommit/hook_context/post_rewrite_spec.rb
+++ b/spec/overcommit/hook_context/post_rewrite_spec.rb
@@ -101,9 +101,8 @@
         end
 
         repo do
-          git_config = '-c protocol.file.allow=always'
           `git commit --allow-empty -m "Initial commit"`
-          `git #{git_config} submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+          `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
           `git commit --amend -m "Add submodule"`
           expect(subject).to_not include File.expand_path('test-sub')
         end
diff --git a/spec/overcommit/hook_context/pre_commit_spec.rb b/spec/overcommit/hook_context/pre_commit_spec.rb
index 719982a1..dae42e66 100644
--- a/spec/overcommit/hook_context/pre_commit_spec.rb
+++ b/spec/overcommit/hook_context/pre_commit_spec.rb
@@ -207,7 +207,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -383,7 +383,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -409,7 +409,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -441,7 +441,7 @@
         end
 
         repo do
-          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           `git rm sub`
           example.run
@@ -470,7 +470,7 @@
       end
 
       repo do
-        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         expect(subject).to_not include File.expand_path('test-sub')
       end
     end
diff --git a/spec/overcommit/hook_context/run_all_spec.rb b/spec/overcommit/hook_context/run_all_spec.rb
index c6696edc..516fb70b 100644
--- a/spec/overcommit/hook_context/run_all_spec.rb
+++ b/spec/overcommit/hook_context/run_all_spec.rb
@@ -46,8 +46,7 @@
         end
 
         repo do
-          git_config = '-c protocol.file.allow=always'
-          `git #{git_config} submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+          `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
           example.run
         end
       end
diff --git a/spec/overcommit/installer_spec.rb b/spec/overcommit/installer_spec.rb
index 8739a70e..c7cfb05e 100644
--- a/spec/overcommit/installer_spec.rb
+++ b/spec/overcommit/installer_spec.rb
@@ -231,7 +231,7 @@ def hook_files_installed?(hooks_dir)
       context 'which has an external git dir' do
         let(:submodule) { File.join(target, 'submodule') }
         before do
-          system 'git', '-c', 'protocol.file.allow=always', 'submodule', 'add', target, 'submodule',
+          system 'git', 'submodule', 'add', target, 'submodule',
                  chdir: target, out: :close, err: :close
         end
         let(:submodule_git_file) { File.join(submodule, '.git') }

From 9c3d118b8f21ef8bf77d9a9dfc62a8051f8078d3 Mon Sep 17 00:00:00 2001
From: Sorin Guga <fulf@users.noreply.github.com>
Date: Sun, 25 Feb 2024 01:58:04 +0200
Subject: [PATCH 199/223] Green CI PoC (#833)

Cherry-picked commits from #830, #831, #832, #835, #837 and #839.
---
 .github/workflows/lint.yml                    |  2 +-
 .github/workflows/tests.yml                   | 29 ++++++++-----------
 Gemfile                                       |  6 +++-
 .../pre_commit/rails_schema_up_to_date.rb     |  2 +-
 spec/overcommit/git_repo_spec.rb              | 20 ++++++++-----
 .../hook/prepare_commit_msg/base_spec.rb      |  6 ++--
 .../hook_context/commit_msg_spec.rb           | 10 +++----
 .../hook_context/pre_commit_spec.rb           | 10 +++----
 spec/overcommit/installer_spec.rb             |  4 +--
 9 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8b23cbab..8cf8b4a0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 26c20dd1..e9987e06 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,25 +14,20 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '2.6'
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
         os:
           - ubuntu
-          - windows
-
-        # Tempfile behavior has changed on Ruby 3.1 such that tests
-        # fail with permission denied. Would welcome a PR with a fix.
-        exclude:
-          - ruby-version: '3.1'
-            os: windows
-          - ruby-version: '3.2'
-            os: windows
+          # At the moment of this commit various specs fail on Windows.
+          # Any contributor is welcome to fix them and enable the Windows build.
+          # Please see Issue #836 for more details.
+          # - windows
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
@@ -47,7 +42,7 @@ jobs:
           bundle exec rspec
 
       - name: Code coverage reporting
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.github_token }}
           flag-name: ruby${{ matrix.ruby-version }}-${{ matrix.os }}
@@ -59,7 +54,7 @@ jobs:
 
     steps:
       - name: Finalize code coverage report
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.github_token }}
           parallel-finished: true
diff --git a/Gemfile b/Gemfile
index 53b13c7f..49dc7923 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,10 @@ gem 'simplecov', '~> 0.21.0'
 gem 'simplecov-lcov', '~> 0.8.0'
 
 # Pin RuboCop for CI builds
-gem 'rubocop', '1.59.0'
+if RUBY_VERSION < '2.7.0'
+  gem 'rubocop', '1.50.0'
+else
+  gem 'rubocop', '1.59.0'
+end
 
 gem 'ffi' if Gem.win_platform?
diff --git a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
index dafd31a1..61725074 100644
--- a/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
+++ b/lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
@@ -53,7 +53,7 @@ def schema_files
     end
 
     def schema
-      @schema ||= schema_files.map { |file| File.read(file, encoding) }.join
+      @schema ||= schema_files.map { |file| File.read(file, **(encoding || {})) }.join
       @schema.tr('_', '')
     end
 
diff --git a/spec/overcommit/git_repo_spec.rb b/spec/overcommit/git_repo_spec.rb
index 128737c3..b887415b 100644
--- a/spec/overcommit/git_repo_spec.rb
+++ b/spec/overcommit/git_repo_spec.rb
@@ -24,12 +24,13 @@
         end
 
         submodule = repo do
-          `git submodule add #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
+          `git -c protocol.file.allow=always submodule add \
+            #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
           `git commit -m "Add nested submodule"`
         end
 
         repo do
-          `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
           example.run
         end
       end
@@ -150,7 +151,7 @@
         end
 
         before do
-          `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
         end
 
         it { should_not include File.expand_path('sub') }
@@ -178,7 +179,8 @@
           `git commit --allow-empty -m "Submodule commit"`
         end
 
-        `git submodule add #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add \
+          #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
         `git commit -m "Add submodule"`
       end
 
@@ -282,7 +284,7 @@
         touch 'tracked'
         `git add tracked`
         `git commit -m "Initial commit"`
-        `git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
         touch 'staged'
         `git add staged`
         example.run
@@ -327,7 +329,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
         `git commit -m "Initial commit"`
         example.run
       end
@@ -343,7 +345,8 @@
           `git commit --allow-empty -m "Another submodule"`
         end
 
-        `git submodule add #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add \
+          #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
       end
 
       it { should be_empty }
@@ -369,7 +372,8 @@
           `git commit --allow-empty -m "Another submodule"`
         end
 
-        `git submodule add #{another_submodule} yet-another-sub-repo 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add \
+          #{another_submodule} yet-another-sub-repo 2>&1 > #{File::NULL}`
         `git commit -m "Add yet another submodule"`
         `git rm sub-repo`
         `git rm yet-another-sub-repo`
diff --git a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
index 616d6b8e..873ed637 100644
--- a/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
+++ b/spec/overcommit/hook/prepare_commit_msg/base_spec.rb
@@ -38,9 +38,9 @@
           contents + "bravo\n"
         end
       end
-      Thread.new { hook_1.run }
-      Thread.new { hook_2.run }
-      Thread.list.each { |t| t.join unless t == Thread.current }
+      t1 = Thread.new { hook_1.run }
+      t2 = Thread.new { hook_2.run }
+      [t1, t2].each(&:join)
       expect(File.read(tempfile)).to match(/alpha\n#{initial_content}bravo\n/m)
     end
   end
diff --git a/spec/overcommit/hook_context/commit_msg_spec.rb b/spec/overcommit/hook_context/commit_msg_spec.rb
index 2aa68516..058f1508 100644
--- a/spec/overcommit/hook_context/commit_msg_spec.rb
+++ b/spec/overcommit/hook_context/commit_msg_spec.rb
@@ -298,7 +298,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -474,7 +474,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -500,7 +500,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -532,7 +532,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           `git rm sub`
           example.run
@@ -561,7 +561,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         expect(subject).to_not include File.expand_path('test-sub')
       end
     end
diff --git a/spec/overcommit/hook_context/pre_commit_spec.rb b/spec/overcommit/hook_context/pre_commit_spec.rb
index dae42e66..719982a1 100644
--- a/spec/overcommit/hook_context/pre_commit_spec.rb
+++ b/spec/overcommit/hook_context/pre_commit_spec.rb
@@ -207,7 +207,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -383,7 +383,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -409,7 +409,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           echo('Hello World', 'sub/submodule-file')
           `git submodule foreach "git add submodule-file" < #{File::NULL}`
@@ -441,7 +441,7 @@
         end
 
         repo do
-          `git submodule add #{submodule} sub > #{File::NULL} 2>&1`
+          `git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
           `git commit -m "Add submodule"`
           `git rm sub`
           example.run
@@ -470,7 +470,7 @@
       end
 
       repo do
-        `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+        `git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
         expect(subject).to_not include File.expand_path('test-sub')
       end
     end
diff --git a/spec/overcommit/installer_spec.rb b/spec/overcommit/installer_spec.rb
index c7cfb05e..5283b2b6 100644
--- a/spec/overcommit/installer_spec.rb
+++ b/spec/overcommit/installer_spec.rb
@@ -231,8 +231,8 @@ def hook_files_installed?(hooks_dir)
       context 'which has an external git dir' do
         let(:submodule) { File.join(target, 'submodule') }
         before do
-          system 'git', 'submodule', 'add', target, 'submodule',
-                 chdir: target, out: :close, err: :close
+          system 'git', '-c', 'protocol.file.allow=always', 'submodule', 'add', target,
+                 'submodule', chdir: target, out: :close, err: :close
         end
         let(:submodule_git_file) { File.join(submodule, '.git') }
         let(:submodule_git_dir) do

From a2fb742f28407c9a762d60ae723a796b6472667c Mon Sep 17 00:00:00 2001
From: Sorin Guga <fulf@users.noreply.github.com>
Date: Sun, 25 Feb 2024 02:05:52 +0200
Subject: [PATCH 200/223] [FEATURE] New pre-commit hook: Sorbet (Issue #825)
 (#826)

## Introduction
This pre-commit hook runs the Sorbet type-checker.
[More information about Sorbet here](https://sorbet.org/docs/overview)

Fixes #825

## Requirements
[Sorbet](https://github.com/sorbet/sorbet)

Notes: not sure if this should be a pre-commit hook or pre-push hook to
be honest.

Co-authored-by: Shane da Silva <shane@dasilva.io>
---
 README.md                                     | 66 +++++++++++--------
 config/default.yml                            |  8 +++
 lib/overcommit/hook/pre_commit/sorbet.rb      | 24 +++++++
 .../overcommit/hook/pre_commit/sorbet_spec.rb | 54 +++++++++++++++
 4 files changed, 124 insertions(+), 28 deletions(-)
 create mode 100644 lib/overcommit/hook/pre_commit/sorbet.rb
 create mode 100644 spec/overcommit/hook/pre_commit/sorbet_spec.rb

diff --git a/README.md b/README.md
index afcbcbbf..769c1cf1 100644
--- a/README.md
+++ b/README.md
@@ -17,34 +17,43 @@ are stored in source control. You can also easily
 [add your existing hook scripts](#adding-existing-git-hooks) without writing
 any Ruby code.
 
-* [Requirements](#requirements)
-  * [Dependencies](#dependencies)
-* [Installation](#installation)
-  * [Automatically Install Overcommit Hooks](#automatically-install-overcommit-hooks)
-* [Usage](#usage)
-* [Continuous Integration](#continuous-integration)
-* [Configuration](#configuration)
-  * [Hook Options](#hook-options)
-  * [Hook Categories](#hook-categories)
-  * [Gemfile](#gemfile)
-  * [Plugin Directory](#plugin-directory)
-  * [Signature Verification](#signature-verification)
-* [Built-In Hooks](#built-in-hooks)
-  * [CommitMsg](#commitmsg)
-  * [PostCheckout](#postcheckout)
-  * [PostCommit](#postcommit)
-  * [PostMerge](#postmerge)
-  * [PostRewrite](#postrewrite)
-  * [PreCommit](#precommit)
-  * [PrePush](#prepush)
-  * [PreRebase](#prerebase)
-* [Repo-Specific Hooks](#repo-specific-hooks)
-  * [Adding Existing Git Hooks](#adding-existing-git-hooks)
-* [Security](#security)
-* [Contributing](#contributing)
-* [Community](#community)
-* [Changelog](#changelog)
-* [License](#license)
+- [Requirements](#requirements)
+  - [Windows](#windows)
+  - [Dependencies](#dependencies)
+- [Installation](#installation)
+  - [Automatically Install Overcommit Hooks](#automatically-install-overcommit-hooks)
+- [Usage](#usage)
+  - [Skipping Hooks](#skipping-hooks)
+  - [Disabling Overcommit](#disabling-overcommit)
+  - [Disabling Colorized Output](#disabling-colorized-output)
+- [Continuous Integration](#continuous-integration)
+- [Configuration](#configuration)
+  - [Hook Options](#hook-options)
+  - [Hook Categories](#hook-categories)
+    - [The `ALL` Hook](#the-all-hook)
+  - [Gemfile](#gemfile)
+  - [Plugin Directory](#plugin-directory)
+  - [Quiet Hook Runs](#quiet-hook-runs)
+  - [Concurrency](#concurrency)
+  - [Signature Verification](#signature-verification)
+- [Built-In Hooks](#built-in-hooks)
+  - [CommitMsg](#commitmsg)
+  - [PostCheckout](#postcheckout)
+  - [PostCommit](#postcommit)
+  - [PostMerge](#postmerge)
+  - [PostRewrite](#postrewrite)
+  - [PreCommit](#precommit)
+    - [WARNING: pre-commit hooks cannot have side effects](#warning-pre-commit-hooks-cannot-have-side-effects)
+  - [PrePush](#prepush)
+  - [PreRebase](#prerebase)
+- [Repo-Specific hooks](#repo-specific-hooks)
+  - [Adding Existing Git Hooks](#adding-existing-git-hooks)
+- [Security](#security)
+  - [Disabling Signature Checking](#disabling-signature-checking)
+- [Contributing](#contributing)
+- [Community](#community)
+- [Changelog](#changelog)
+- [License](#license)
 
 ## Requirements
 
@@ -561,6 +570,7 @@ issue](https://github.com/sds/overcommit/issues/238) for more details.
 * [SemiStandard](lib/overcommit/hook/pre_commit/semi_standard.rb)
 * [ShellCheck](lib/overcommit/hook/pre_commit/shell_check.rb)
 * [SlimLint](lib/overcommit/hook/pre_commit/slim_lint.rb)
+* [Sorbet](lib/overcommit/hook/pre_commit/sorbet.rb)
 * [Sqlint](lib/overcommit/hook/pre_commit/sqlint.rb)
 * [Standard](lib/overcommit/hook/pre_commit/standard.rb)
 * [Stylelint](lib/overcommit/hook/pre_commit/stylelint.rb)
diff --git a/config/default.yml b/config/default.yml
index 181187af..e0fc3910 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -790,6 +790,14 @@ PreCommit:
     install_command: 'gem install slim_lint'
     include: '**/*.slim'
 
+  Sorbet:
+    enabled: false
+    description: 'Analyze with Sorbet'
+    required_executable: 'srb'
+    install_command: 'gem install sorbet'
+    command: ['srb', 'tc']
+    include: '**/*.rb'
+
   Sqlint:
     enabled: false
     description: 'Analyze with sqlint'
diff --git a/lib/overcommit/hook/pre_commit/sorbet.rb b/lib/overcommit/hook/pre_commit/sorbet.rb
new file mode 100644
index 00000000..57988a6e
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/sorbet.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs 'srb tc' against any modified files.
+  #
+  # @see https://github.com/sorbet/sorbet
+  class Sorbet < Base
+    # example of output:
+    # sorbet.rb:1: Method `foo` does not exist on `T.class_of(Bar)` https://srb.help/7003
+    MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+): (?<message>.*)$/.freeze
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      output = result.stderr.split("\n").grep(MESSAGE_REGEX)
+
+      extract_messages(
+        output,
+        MESSAGE_REGEX
+      )
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/sorbet_spec.rb b/spec/overcommit/hook/pre_commit/sorbet_spec.rb
new file mode 100644
index 00000000..60f811cb
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/sorbet_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::Sorbet do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  before do
+    subject.stub(:applicable_files).and_return(%w[file1.rb file2.rb])
+  end
+
+  context 'when Sorbet exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+
+    context 'and it printed a message to stderr' do
+      before do
+        result.stub(:stderr).and_return("No errors! Great job.\n")
+      end
+
+      it { should pass }
+    end
+  end
+
+  context 'when Sorbet exits unsucessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:stderr).and_return(normalize_indent(<<-MSG))
+            sorbet.rb:1: Method `foo` does not exist on `T.class_of(Bar)` https://srb.help/7003
+            5 |  foo 'bar'
+                      ^^^
+            Errors: 1
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+  end
+end

From c4aa796d09ac5a432501a37cf270f8edc6aa4cb2 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 24 Feb 2024 16:12:12 -0800
Subject: [PATCH 201/223] Fix RuboCop warnings (#841)

---
 .rubocop.yml                                  |  4 +++-
 lib/overcommit/cli.rb                         | 16 +++++++---------
 lib/overcommit/hook/base.rb                   | 14 ++++++--------
 lib/overcommit/hook/commit_msg/text_width.rb  |  2 +-
 lib/overcommit/hook/pre_commit/erb_lint.rb    |  2 +-
 lib/overcommit/hook/pre_commit/html_hint.rb   |  2 +-
 lib/overcommit/hook/pre_commit/json_syntax.rb | 10 ++++------
 lib/overcommit/hook/pre_commit/xml_syntax.rb  | 10 ++++------
 lib/overcommit/hook/pre_commit/yaml_syntax.rb | 16 +++++++---------
 lib/overcommit/utils/messages_utils.rb        |  2 +-
 overcommit.gemspec                            |  2 +-
 11 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8c779097..1b4e7ad7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,9 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
+  NewCops: disable
+  SuggestExtensions: false
 
 Layout/ClosingParenthesisIndentation:
   Enabled: false
diff --git a/lib/overcommit/cli.rb b/lib/overcommit/cli.rb
index bc2ec994..f8127125 100644
--- a/lib/overcommit/cli.rb
+++ b/lib/overcommit/cli.rb
@@ -124,15 +124,13 @@ def install_or_uninstall
       end
 
       @options[:targets].each do |target|
-        begin
-          Installer.new(log).run(target, @options)
-        rescue Overcommit::Exceptions::InvalidGitRepo => e
-          log.warning "Invalid repo #{target}: #{e}"
-          halt 69 # EX_UNAVAILABLE
-        rescue Overcommit::Exceptions::PreExistingHooks => e
-          log.warning "Unable to install into #{target}: #{e}"
-          halt 73 # EX_CANTCREAT
-        end
+        Installer.new(log).run(target, @options)
+      rescue Overcommit::Exceptions::InvalidGitRepo => e
+        log.warning "Invalid repo #{target}: #{e}"
+        halt 69 # EX_UNAVAILABLE
+      rescue Overcommit::Exceptions::PreExistingHooks => e
+        log.warning "Unable to install into #{target}: #{e}"
+        halt 73 # EX_CANTCREAT
       end
     end
 
diff --git a/lib/overcommit/hook/base.rb b/lib/overcommit/hook/base.rb
index 37696d08..3c2eaeb3 100644
--- a/lib/overcommit/hook/base.rb
+++ b/lib/overcommit/hook/base.rb
@@ -228,14 +228,12 @@ def check_for_libraries
       output = []
 
       required_libraries.each do |library|
-        begin
-          require library
-        rescue LoadError
-          install_command = @config['install_command']
-          install_command = " -- install via #{install_command}" if install_command
-
-          output << "Unable to load '#{library}'#{install_command}"
-        end
+        require library
+      rescue LoadError
+        install_command = @config['install_command']
+        install_command = " -- install via #{install_command}" if install_command
+
+        output << "Unable to load '#{library}'#{install_command}"
       end
 
       return if output.empty?
diff --git a/lib/overcommit/hook/commit_msg/text_width.rb b/lib/overcommit/hook/commit_msg/text_width.rb
index 63addbcf..52de3bd7 100644
--- a/lib/overcommit/hook/commit_msg/text_width.rb
+++ b/lib/overcommit/hook/commit_msg/text_width.rb
@@ -41,7 +41,7 @@ def find_errors_in_body(lines)
 
       max_body_width = config['max_body_width']
 
-      lines[2..-1].each_with_index do |line, index|
+      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"
diff --git a/lib/overcommit/hook/pre_commit/erb_lint.rb b/lib/overcommit/hook/pre_commit/erb_lint.rb
index a903b10b..ae5af164 100644
--- a/lib/overcommit/hook/pre_commit/erb_lint.rb
+++ b/lib/overcommit/hook/pre_commit/erb_lint.rb
@@ -12,7 +12,7 @@ def run
       return :pass if result.success?
 
       extract_messages(
-        result.stdout.split("\n\n")[1..-1],
+        result.stdout.split("\n\n")[1..],
         MESSAGE_REGEX
       )
     end
diff --git a/lib/overcommit/hook/pre_commit/html_hint.rb b/lib/overcommit/hook/pre_commit/html_hint.rb
index e8cb4a68..ddbe37d1 100644
--- a/lib/overcommit/hook/pre_commit/html_hint.rb
+++ b/lib/overcommit/hook/pre_commit/html_hint.rb
@@ -14,7 +14,7 @@ def run
         lines = group.split("\n").map(&:strip)
         file = lines[0][/(.+):/, 1]
         extract_messages(
-          lines[1..-1].map { |msg| "#{file}: #{msg}" },
+          lines[1..].map { |msg| "#{file}: #{msg}" },
           /^(?<file>(?:\w:)?[^:]+): line (?<line>\d+)/
         )
       end.flatten
diff --git a/lib/overcommit/hook/pre_commit/json_syntax.rb b/lib/overcommit/hook/pre_commit/json_syntax.rb
index 04972b91..bd162f7d 100644
--- a/lib/overcommit/hook/pre_commit/json_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/json_syntax.rb
@@ -7,12 +7,10 @@ def run
       messages = []
 
       applicable_files.each do |file|
-        begin
-          JSON.parse(IO.read(file))
-        rescue JSON::ParserError => e
-          error = "#{e.message} parsing #{file}"
-          messages << Overcommit::Hook::Message.new(:error, file, nil, error)
-        end
+        JSON.parse(IO.read(file))
+      rescue JSON::ParserError => e
+        error = "#{e.message} parsing #{file}"
+        messages << Overcommit::Hook::Message.new(:error, file, nil, error)
       end
 
       messages
diff --git a/lib/overcommit/hook/pre_commit/xml_syntax.rb b/lib/overcommit/hook/pre_commit/xml_syntax.rb
index 7ac05360..99465182 100644
--- a/lib/overcommit/hook/pre_commit/xml_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/xml_syntax.rb
@@ -7,12 +7,10 @@ def run
       messages = []
 
       applicable_files.each do |file|
-        begin
-          REXML::Document.new(IO.read(file))
-        rescue REXML::ParseException => e
-          error = "Error parsing #{file}: #{e.message}"
-          messages << Overcommit::Hook::Message.new(:error, file, nil, error)
-        end
+        REXML::Document.new(IO.read(file))
+      rescue REXML::ParseException => e
+        error = "Error parsing #{file}: #{e.message}"
+        messages << Overcommit::Hook::Message.new(:error, file, nil, error)
       end
 
       messages
diff --git a/lib/overcommit/hook/pre_commit/yaml_syntax.rb b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
index dd685450..83ff6789 100644
--- a/lib/overcommit/hook/pre_commit/yaml_syntax.rb
+++ b/lib/overcommit/hook/pre_commit/yaml_syntax.rb
@@ -7,17 +7,15 @@ def run
       messages = []
 
       applicable_files.each do |file|
+        YAML.load_file(file, aliases: true)
+      rescue ArgumentError
         begin
-          YAML.load_file(file, aliases: true)
-        rescue ArgumentError
-          begin
-            YAML.load_file(file)
-          rescue ArgumentError, Psych::SyntaxError => e
-            messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
-          end
-        rescue Psych::DisallowedClass => e
-          messages << error_message(file, e)
+          YAML.load_file(file)
+        rescue ArgumentError, Psych::SyntaxError => e
+          messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
         end
+      rescue Psych::DisallowedClass => e
+        messages << error_message(file, e)
       end
 
       messages
diff --git a/lib/overcommit/utils/messages_utils.rb b/lib/overcommit/utils/messages_utils.rb
index c92a6010..31c0f8db 100644
--- a/lib/overcommit/utils/messages_utils.rb
+++ b/lib/overcommit/utils/messages_utils.rb
@@ -26,7 +26,7 @@ def extract_messages(output_messages, regex, type_categorizer = nil)
             raise Overcommit::Exceptions::MessageProcessingError,
                   'Unexpected output: unable to determine line number or type ' \
                   "of error/warning for output:\n" \
-                  "#{output_messages[index..-1].join("\n")}"
+                  "#{output_messages[index..].join("\n")}"
           end
 
           file = extract_file(match, message)
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 8bc70845..268a9fc1 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
                             Dir['libexec/**/*'] +
                             Dir['template-dir/**/*']
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.6'
 
   s.add_dependency          'childprocess', '>= 0.6.3', '< 6'
   s.add_dependency          'iniparse', '~> 1.4'

From b58b6358e7e8d8a278d4ebba83a5b4a68d2f0058 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 24 Feb 2024 16:18:43 -0800
Subject: [PATCH 202/223] Add RSpec Hook to PreCommit, Add Applicable files if
 set (#842)

- **Add RSpec to pre_commit hooks**
- **Add applicable files to RSpec command if include configuration set**
- **Fix RuboCop errors**

---------

Co-authored-by: Max Prettyjohns <max@pixielabs.io>
---
 config/default.yml                            |   5 +
 lib/overcommit/hook/pre_commit/r_spec.rb      |  12 ++
 lib/overcommit/hook/pre_push/r_spec.rb        |  12 +-
 lib/overcommit/hook/shared/r_spec.rb          |  21 ++++
 .../overcommit/hook/pre_commit/r_spec_spec.rb | 116 ++++++++++++++++++
 spec/overcommit/hook/pre_push/r_spec_spec.rb  |  36 ++++++
 6 files changed, 194 insertions(+), 8 deletions(-)
 create mode 100644 lib/overcommit/hook/pre_commit/r_spec.rb
 create mode 100644 lib/overcommit/hook/shared/r_spec.rb
 create mode 100644 spec/overcommit/hook/pre_commit/r_spec_spec.rb

diff --git a/config/default.yml b/config/default.yml
index e0fc3910..70ae0b2d 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -709,6 +709,11 @@ PreCommit:
     install_command: 'pip install restructuredtext_lint'
     include: '**/*.rst'
 
+  RSpec:
+    enabled: false
+    description: 'Run tests with Rspec'
+    required_executable: 'rspec'
+
   RuboCop:
     enabled: false
     description: 'Analyze with RuboCop'
diff --git a/lib/overcommit/hook/pre_commit/r_spec.rb b/lib/overcommit/hook/pre_commit/r_spec.rb
new file mode 100644
index 00000000..26bbc0a8
--- /dev/null
+++ b/lib/overcommit/hook/pre_commit/r_spec.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'overcommit/hook/shared/r_spec'
+
+module Overcommit::Hook::PreCommit
+  # Runs `rspec` test suite
+  #
+  # @see http://rspec.info/
+  class RSpec < Base
+    include Overcommit::Hook::Shared::RSpec
+  end
+end
diff --git a/lib/overcommit/hook/pre_push/r_spec.rb b/lib/overcommit/hook/pre_push/r_spec.rb
index a3b4474c..7ce3df29 100644
--- a/lib/overcommit/hook/pre_push/r_spec.rb
+++ b/lib/overcommit/hook/pre_push/r_spec.rb
@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
+require 'overcommit/hook/shared/r_spec'
+
 module Overcommit::Hook::PrePush
-  # Runs `rspec` test suite before push
+  # Runs `rspec` test suite
   #
   # @see http://rspec.info/
   class RSpec < Base
-    def run
-      result = execute(command)
-      return :pass if result.success?
-
-      output = result.stdout + result.stderr
-      [:fail, output]
-    end
+    include Overcommit::Hook::Shared::RSpec
   end
 end
diff --git a/lib/overcommit/hook/shared/r_spec.rb b/lib/overcommit/hook/shared/r_spec.rb
new file mode 100644
index 00000000..9b41e8e1
--- /dev/null
+++ b/lib/overcommit/hook/shared/r_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::Shared
+  # Runs `rspec` test suite before push
+  #
+  # @see http://rspec.info/
+  module RSpec
+    def run
+      result = if @config['include']
+                 execute(command, args: applicable_files)
+               else
+                 execute(command)
+               end
+
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_commit/r_spec_spec.rb b/spec/overcommit/hook/pre_commit/r_spec_spec.rb
new file mode 100644
index 00000000..7fdff3b3
--- /dev/null
+++ b/spec/overcommit/hook/pre_commit/r_spec_spec.rb
@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Overcommit::Hook::PreCommit::RSpec do
+  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:context) { double('context') }
+  subject { described_class.new(config, context) }
+
+  context 'when rspec exits successfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+    end
+
+    it { should pass }
+
+    it {
+      expect(subject).to receive(:execute).with(['rspec']).and_return(result)
+
+      subject.run
+    }
+  end
+
+  context 'with included files set' do
+    let(:result) { double('result') }
+    let(:config) do
+      super().merge(Overcommit::Configuration.new(
+                      'PreCommit' => {
+                        'RSpec' => {
+                          'include' => ['**/*_spec.rb'],
+                        }
+                      }
+      ))
+    end
+
+    let(:context) { double('context') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+      subject.stub(:applicable_files).and_return('spec/test_spec.rb')
+    end
+
+    it { should pass }
+
+    it {
+      expect(subject).to receive(:execute).with(['rspec'],
+                                                args: 'spec/test_spec.rb').and_return(result)
+
+      subject.run
+    }
+  end
+
+  context 'when rspec exits unsuccessfully' do
+    let(:result) { double('result') }
+
+    before do
+      result.stub(:success?).and_return(false)
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'with a runtime error' do
+      before do
+        result.stub(stdout: '', stderr: <<-MSG)
+          /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/configuration.rb:1226:in `load': /home/user/dev/github/overcommit/spec/overcommit/hook/pre_push/rspec_spec.rb:49: can't find string "EOS" anywhere before EOF (SyntaxError)
+          /home/user/dev/overcommit/spec/overcommit/hook/pre_push/rspec_spec.rb:29: syntax error, unexpected end-of-input
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/configuration.rb:1226:in `block in load_spec_files'
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/configuration.rb:1224:in `each'
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/configuration.rb:1224:in `load_spec_files'
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/runner.rb:97:in `setup'
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/runner.rb:85:in `run'
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/runner.rb:70:in `run'
+            from /home/user/.rbenv/gems/2.2.0/gems/rspec-core-3.2.2/lib/rspec/core/runner.rb:38:in `invoke'
+            from /home/user/.rbenv/versions/2.2.1/lib/ruby/gems/2.2.0/gems/rspec-core-3.2.2/exe/rspec:4:in `<top (required)>'
+            from /home/user/.rbenv/versions/2.2.1/bin/rspec:23:in `load'
+            from /home/user/.rbenv/versions/2.2.1/bin/rspec:23:in `<main>'
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+
+    context 'with a test failure' do
+      before do
+        result.stub(stderr: '', stdout: <<-MSG)
+          .FF
+
+          Failures:
+
+            1) Overcommit::Hook::PrePush::RSpec when rspec exits unsuccessfully with a runtime error should fail
+               Failure/Error: it { should fail_hook }
+                 expected that the hook would fail
+               # ./spec/overcommit/hook/pre_push/rspec_spec.rb:45:in `block (4 levels) in <top (required)>'
+
+            2) Overcommit::Hook::PrePush::RSpec when rspec exits unsuccessfully with a test failure should fail
+               Failure/Error: it { should fail_hook }
+                 expected that the hook would fail
+               # ./spec/overcommit/hook/pre_push/rspec_spec.rb:57:in `block (4 levels) in <top (required)>'
+
+          Finished in 0.00505 seconds (files took 0.27437 seconds to load)
+          3 examples, 2 failures
+
+          Failed examples:
+
+          rspec ./spec/overcommit/hook/pre_push/rspec_spec.rb:45 # Overcommit::Hook::PrePush::RSpec when rspec exits unsuccessfully with a runtime error should fail
+          rspec ./spec/overcommit/hook/pre_push/rspec_spec.rb:57 # Overcommit::Hook::PrePush::RSpec when rspec exits unsuccessfully with a test failure should fail
+        MSG
+      end
+
+      it { should fail_hook }
+    end
+  end
+end
diff --git a/spec/overcommit/hook/pre_push/r_spec_spec.rb b/spec/overcommit/hook/pre_push/r_spec_spec.rb
index 26f6ea0f..1efc56d7 100644
--- a/spec/overcommit/hook/pre_push/r_spec_spec.rb
+++ b/spec/overcommit/hook/pre_push/r_spec_spec.rb
@@ -16,6 +16,42 @@
     end
 
     it { should pass }
+
+    it {
+      expect(subject).to receive(:execute).with(['rspec']).and_return(result)
+
+      subject.run
+    }
+  end
+
+  context 'with included files set' do
+    let(:result) { double('result') }
+    let(:config) do
+      super().merge(Overcommit::Configuration.new(
+                      'PrePush' => {
+                        'RSpec' => {
+                          'include' => ['**/*_spec.rb'],
+                        }
+                      }
+      ))
+    end
+
+    let(:context) { double('context') }
+
+    before do
+      result.stub(:success?).and_return(true)
+      subject.stub(:execute).and_return(result)
+      subject.stub(:applicable_files).and_return('spec/test_spec.rb')
+    end
+
+    it { should pass }
+
+    it {
+      expect(subject).to receive(:execute).with(['rspec'],
+                                                args: 'spec/test_spec.rb').and_return(result)
+
+      subject.run
+    }
   end
 
   context 'when rspec exits unsuccessfully' do

From b700bd25723fe0a731c2102d33b42d5e5d760d80 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 24 Feb 2024 16:24:07 -0800
Subject: [PATCH 203/223] Cut version 0.63.0 (#843)

---
 CHANGELOG.md              | 5 +++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5953a7c1..f61b7d5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## 0.63.0
+
+* Add `Sorbet` pre-commit hook
+* Add `RSpec` pre-commit hook
+
 ## 0.62.0
 
 * Allow version 5 of `childprocess` gem dependency
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index f6805668..e640bf38 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.62.0'
+  VERSION = '0.63.0'
 end

From 7974b3b08ee8e78ace35ee0472698c830ac08104 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 24 Feb 2024 16:28:42 -0800
Subject: [PATCH 204/223] Fix README badges (#844)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 769c1cf1..4ad91913 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 [![Gem Version](https://badge.fury.io/rb/overcommit.svg)](https://badge.fury.io/rb/overcommit)
-[![Build Status](https://github.com/sds/overcommit/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/sds/overcommit/actions/workflows/tests.yml/badge.svg?branch=master)
-[![Coverage Status](https://coveralls.io/repos/github/sds/overcommit/badge.svg?branch=master)](https://coveralls.io/github/sds/overcommit?branch=master)
+[![Build Status](https://github.com/sds/overcommit/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/sds/overcommit/actions/workflows/tests.yml/badge.svg?branch=main)
+[![Coverage Status](https://coveralls.io/repos/github/sds/overcommit/badge.svg?branch=main)](https://coveralls.io/github/sds/overcommit?branch=main)
 [![Maintainability](https://api.codeclimate.com/v1/badges/5da42f7f365e5fef6b4c/maintainability)](https://codeclimate.com/github/sds/overcommit/maintainability)
-[![Inline docs](http://inch-ci.org/github/sds/overcommit.svg?branch=master)](http://inch-ci.org/github/sds/overcommit)
+[![Inline docs](http://inch-ci.org/github/sds/overcommit.svg?branch=main)](http://inch-ci.org/github/sds/overcommit)
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/sds/overcommit/master/logo/horizontal.png" width="65%" alt="Overcommit Logo"/>

From a14ec6330c778bae3df46fce8b6a640ee74e8d37 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sat, 24 Feb 2024 16:35:08 -0800
Subject: [PATCH 205/223] Update README with latest requirements (#845)

Clarify Windows support is now best effort, given we don't have tests.
---
 README.md | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4ad91913..877e9396 100644
--- a/README.md
+++ b/README.md
@@ -57,15 +57,9 @@ any Ruby code.
 
 ## Requirements
 
-This project aims to support the following Ruby runtimes on both \*nix and Windows:
+This project aims to support the following Ruby runtimes on \*nix (and best effort on Windows):
 
-* Ruby 2.4+
-
-### Windows
-
-If you are using Overcommit on **Windows**, make sure you include the `ffi` gem in your
-list of dependencies. Overcommit does not include the `ffi` gem by default since it
-significantly increases the install time for non-Windows platforms.
+* Ruby 2.6+
 
 ### Dependencies
 

From 841954c64954818be1d246ec01b72f922ca28faa Mon Sep 17 00:00:00 2001
From: Matt Brictson <matt@mattbrictson.com>
Date: Sat, 11 May 2024 23:36:11 -0700
Subject: [PATCH 206/223] Add Ruby 3.3 to CI matrix (#849)

It might be a good idea to also update the `main` branch protection
rules to require that the 3.2 and 3.3 jobs succeed. Right now only 2.7,
3.0, and 3.1 are required. A repository admin will need to make this
change.
---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e9987e06..0e2aac20 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,6 +19,7 @@ jobs:
           - "3.0"
           - "3.1"
           - "3.2"
+          - "3.3"
         os:
           - ubuntu
           # At the moment of this commit various specs fail on Windows.

From 0e717f97a60e88ddd0b8a408b84f4420d7bda1a8 Mon Sep 17 00:00:00 2001
From: Matt Brictson <matt@mattbrictson.com>
Date: Sat, 11 May 2024 23:36:50 -0700
Subject: [PATCH 207/223] Support stylelint 16+, which emits messages on stderr
 (#848)

Before Stylelint 16, Stylelint emitted its messages on stdout. Hence
Overcommit's Stylelint hook was built to read output from stdout.

Starting with Stylelint 16, Stylelint now emits its messages to stderr,
which means the existing Overcommit implementation no longer works.

This PR updates Overcommit's Stylelint plugin to check for messages on
_both_ stdout and stderr. That way <16 and >=16 versions of Stylelint
are supported.

Fixes #823
---
 lib/overcommit/hook/pre_commit/stylelint.rb   |  2 +-
 .../hook/pre_commit/stylelint_spec.rb         | 29 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/hook/pre_commit/stylelint.rb b/lib/overcommit/hook/pre_commit/stylelint.rb
index b129cbd2..aae26f08 100644
--- a/lib/overcommit/hook/pre_commit/stylelint.rb
+++ b/lib/overcommit/hook/pre_commit/stylelint.rb
@@ -12,7 +12,7 @@ class Stylelint < Base
 
     def run
       result = execute(command, args: applicable_files)
-      output = result.stdout.chomp
+      output = result.stdout + result.stderr.chomp
       return :pass if result.success? && output.empty?
 
       extract_messages(
diff --git a/spec/overcommit/hook/pre_commit/stylelint_spec.rb b/spec/overcommit/hook/pre_commit/stylelint_spec.rb
index d31ba948..68e83f65 100644
--- a/spec/overcommit/hook/pre_commit/stylelint_spec.rb
+++ b/spec/overcommit/hook/pre_commit/stylelint_spec.rb
@@ -15,6 +15,7 @@
     before do
       result = double('result')
       result.stub(:success?).and_return(true)
+      result.stub(:stderr).and_return('')
       result.stub(:stdout).and_return('')
       subject.stub(:execute).and_return(result)
     end
@@ -22,7 +23,7 @@
     it { should pass }
   end
 
-  context 'when stylelint exits unsucessfully' do
+  context 'when stylelint exits unsucessfully with messages on stdout (stylelint < 16)' do
     let(:result) { double('result') }
 
     before do
@@ -32,6 +33,7 @@
     context 'and it reports an error' do
       before do
         result.stub(:success?).and_return(false)
+        result.stub(:stderr).and_return('')
         result.stub(:stdout).and_return([
           'index.css: line 4, col 4, error - Expected indentation of 2 spaces (indentation)',
           'form.css: line 10, col 6, error - Expected indentation of 4 spaces (indentation)',
@@ -45,4 +47,29 @@
       end
     end
   end
+
+  context 'when stylelint exits unsucessfully with messages on stderr (stylelint >= 16)' do
+    let(:result) { double('result') }
+
+    before do
+      subject.stub(:execute).and_return(result)
+    end
+
+    context 'and it reports an error' do
+      before do
+        result.stub(:success?).and_return(false)
+        result.stub(:stdout).and_return('')
+        result.stub(:stderr).and_return([
+          'index.css: line 4, col 4, error - Expected indentation of 2 spaces (indentation)',
+          'form.css: line 10, col 6, error - Expected indentation of 4 spaces (indentation)',
+        ].join("\n"))
+      end
+
+      it { should fail_hook }
+
+      it 'extracts lines numbers correctly from output' do
+        expect(subject.run.map(&:line)).to eq([4, 10])
+      end
+    end
+  end
 end

From 26e78aa9e5e907ed41ebdac8098483af4d54865c Mon Sep 17 00:00:00 2001
From: fynsta <63241108+fynsta@users.noreply.github.com>
Date: Mon, 24 Jun 2024 20:54:52 +0200
Subject: [PATCH 208/223] Add changelog_uri to gemspec (#851)

Supported here:
https://guides.rubygems.org/specification-reference/#metadata Useful for
running https://github.com/MaximeD/gem_updater
---
 overcommit.gemspec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/overcommit.gemspec b/overcommit.gemspec
index 268a9fc1..0b3a590d 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -15,6 +15,10 @@ Gem::Specification.new do |s|
   s.post_install_message  =
     'Install hooks by running `overcommit --install` in your Git repository'
 
+  s.metadata = {
+    'changelog_uri' => 'https://github.com/sds/overcommit/blob/main/CHANGELOG.md'
+  }
+
   s.require_paths         = %w[lib]
 
   s.executables           = ['overcommit']

From 939d9e6be210fb59b453e3ce18abf4409d105503 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 22 Jul 2024 13:48:43 -0700
Subject: [PATCH 209/223] Cut version 0.64.0 (#852)

---
 lib/overcommit/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index e640bf38..9df380b0 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.63.0'
+  VERSION = '0.64.0'
 end

From 5ff9d5e78906813fc9421f2ce9388aee9363b8bf Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 22 Jul 2024 13:52:53 -0700
Subject: [PATCH 210/223] Update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f61b7d5c..d8d2133f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Overcommit Changelog
 
+## 0.64.0
+
+* Add support for `stylelint` 16+
+* Add `changelog_uri` to gemspec
+
 ## 0.63.0
 
 * Add `Sorbet` pre-commit hook

From 5a3d68eaa70573bb600bb9deedda0e5d622eafea Mon Sep 17 00:00:00 2001
From: Joakim Antman <antmanj@gmail.com>
Date: Sun, 11 Aug 2024 09:31:18 +0300
Subject: [PATCH 211/223] Fix spec compatibility with recent git versions
 (#854)

The original array was defining the shellwords like this:
`["git", "commit", "-m", "\"Resolve", "conflicts\"", "-i", "some-file"]`

This combined with the most recent git version failed with:
```
error: pathspec 'conflicts"' did not match any file(s) known to git
```

This PR just simplifies the commit message to work with the %w array
literal.
---
 spec/integration/resolving_cherry_pick_conflict_spec.rb | 2 +-
 spec/integration/resolving_merge_conflict_spec.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/integration/resolving_cherry_pick_conflict_spec.rb b/spec/integration/resolving_cherry_pick_conflict_spec.rb
index 58e22e65..2a7f053c 100644
--- a/spec/integration/resolving_cherry_pick_conflict_spec.rb
+++ b/spec/integration/resolving_cherry_pick_conflict_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'resolving cherry-pick conflicts' do
-  subject { shell(%w[git commit -m "Resolve conflicts" -i some-file]) }
+  subject { shell(%w[git commit -m Test -i some-file]) }
 
   let(:config) { <<-YML }
     PreCommit:
diff --git a/spec/integration/resolving_merge_conflict_spec.rb b/spec/integration/resolving_merge_conflict_spec.rb
index 679ba136..997dcb09 100644
--- a/spec/integration/resolving_merge_conflict_spec.rb
+++ b/spec/integration/resolving_merge_conflict_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'resolving merge conflicts' do
-  subject { shell(%w[git commit -m "Resolve conflicts" -i some-file]) }
+  subject { shell(%w[git commit -m Test -i some-file]) }
 
   around do |example|
     repo do

From 31c83ce603008de3ac04ff9b7d1ea9fca6e529c8 Mon Sep 17 00:00:00 2001
From: Joakim Antman <antmanj@gmail.com>
Date: Sun, 11 Aug 2024 09:37:24 +0300
Subject: [PATCH 212/223]  Expand tildes(~) for hooksPath (#853)

While installing overcommit git hooks i noticed that tildes are not
expanded to home folders for the `hooksPath` config, the result was a
tilde folder in the current directory.

This PR addresses that by switching `File.absolute_path` to
`File.expand_path`. The [underlaying
implementation](https://github.com/ruby/ruby/blob/v3_3_4/file.c#L3753)
in Ruby is exactly the same just with this difference in how `~` is
handled.

---------

Co-authored-by: Shane da Silva <shane@dasilva.io>
---
 lib/overcommit/git_config.rb       |  2 +-
 spec/overcommit/git_config_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/overcommit/git_config.rb b/lib/overcommit/git_config.rb
index 392dd9da..c1243861 100644
--- a/lib/overcommit/git_config.rb
+++ b/lib/overcommit/git_config.rb
@@ -17,7 +17,7 @@ def hooks_path
       path = `git config --get core.hooksPath`.chomp
       return File.join(Overcommit::Utils.git_dir, 'hooks') if path.empty?
 
-      File.absolute_path(path, Dir.pwd)
+      File.expand_path(path, Dir.pwd)
     end
   end
 end
diff --git a/spec/overcommit/git_config_spec.rb b/spec/overcommit/git_config_spec.rb
index 22ad7c02..9cc51862 100644
--- a/spec/overcommit/git_config_spec.rb
+++ b/spec/overcommit/git_config_spec.rb
@@ -78,5 +78,19 @@
         expect(subject).to eq File.expand_path('my-hooks')
       end
     end
+
+    context 'when explicitly set to a path starting with a tilde' do
+      around do |example|
+        repo do
+          `git config --local core.hooksPath ~/my-hooks`
+          example.run
+        end
+      end
+
+      it 'returns the absolute path to the folder in the users home path' do
+        expect(subject).to eq File.expand_path('~/my-hooks')
+        expect(subject).not_to include('~')
+      end
+    end
   end
 end

From 9825868ba2b2194a2329d24c08d47a054bf265cc Mon Sep 17 00:00:00 2001
From: Edward Woodcock <768254+RemoteCTO@users.noreply.github.com>
Date: Thu, 31 Oct 2024 05:47:17 +0100
Subject: [PATCH 213/223] Bump rexml to >= 3.3.9 to resolve GHSA-2rxp-v6pw-ch6m
 (#857)

A `ReDoS vulnerability in REXML` has been identified in versions <3.3.9

Details in GitHub:
 - https://github.com/ruby/rexml/security/advisories/GHSA-2rxp-v6pw-ch6m

This is a small bump to the latest patched version. This should resolve
anybody getting the following `bundle audit` error when using
overcommit:

```
Name: rexml
Version: 3.3.8
CVE: CVE-2024-49761
GHSA: GHSA-2rxp-v6pw-ch6m
Criticality: High
URL: https://github.com/ruby/rexml/security/advisories/GHSA-2rxp-v6pw-ch6m
Title: REXML ReDoS vulnerability
Solution: update to '>= 3.3.9'
```
---
 lib/overcommit/version.rb | 2 +-
 overcommit.gemspec        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 9df380b0..afd18470 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.64.0'
+  VERSION = '0.64.1'
 end
diff --git a/overcommit.gemspec b/overcommit.gemspec
index 0b3a590d..caaa8499 100644
--- a/overcommit.gemspec
+++ b/overcommit.gemspec
@@ -33,5 +33,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency          'childprocess', '>= 0.6.3', '< 6'
   s.add_dependency          'iniparse', '~> 1.4'
-  s.add_dependency          'rexml', '~> 3.2'
+  s.add_dependency          'rexml', '>= 3.3.9'
 end

From eff94a7f058d9eeca3f30e069fadba5a82f43da2 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 30 Oct 2024 21:49:26 -0700
Subject: [PATCH 214/223] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8d2133f..1ba199d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## 0.64.1
+
+* Update minimum version of rexml to address [CVE-2024-49761](https://www.ruby-lang.org/en/news/2024/10/28/redos-rexml-cve-2024-49761/)
+
 ## 0.64.0
 
 * Add support for `stylelint` 16+

From 7d3e8fa5ed9feb07a57e7fec685a46ccd58769ee Mon Sep 17 00:00:00 2001
From: Carlos Palhares <chjunior@gmail.com>
Date: Mon, 27 Jan 2025 16:26:12 -0300
Subject: [PATCH 215/223] Load bundled gems on expected version (#859)

Fixes https://github.com/sds/overcommit/issues/789

`psych` is no longer a default gem, but current and old ruby still ships
with it. When we `require 'yaml'`, we activate that gem in whatever
version that is bundled with ruby. Later on, we load bundler, and we
`Bundler.setup`, which will then activate whatever version specified in
the lock file. More often than not, they might not match.

The approach in this PR is to strip the `yaml` dependency completely
from the hook scripts, while retaining the ability to configure the
Gemfile using it.
---
 template-dir/hooks/commit-msg         | 10 ++--------
 template-dir/hooks/overcommit-hook    | 10 ++--------
 template-dir/hooks/post-checkout      | 10 ++--------
 template-dir/hooks/post-commit        | 10 ++--------
 template-dir/hooks/post-merge         | 10 ++--------
 template-dir/hooks/post-rewrite       | 10 ++--------
 template-dir/hooks/pre-commit         | 10 ++--------
 template-dir/hooks/pre-push           | 10 ++--------
 template-dir/hooks/pre-rebase         | 10 ++--------
 template-dir/hooks/prepare-commit-msg | 10 ++--------
 10 files changed, 20 insertions(+), 80 deletions(-)

diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/commit-msg
+++ b/template-dir/hooks/commit-msg
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/overcommit-hook
+++ b/template-dir/hooks/overcommit-hook
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/post-checkout
+++ b/template-dir/hooks/post-checkout
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/post-commit
+++ b/template-dir/hooks/post-commit
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/post-merge
+++ b/template-dir/hooks/post-merge
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/post-rewrite
+++ b/template-dir/hooks/post-rewrite
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/pre-commit
+++ b/template-dir/hooks/pre-commit
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/pre-push
+++ b/template-dir/hooks/pre-push
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/pre-rebase
+++ b/template-dir/hooks/pre-rebase
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
index 7f8023de..377c892b 100755
--- a/template-dir/hooks/prepare-commit-msg
+++ b/template-dir/hooks/prepare-commit-msg
@@ -27,14 +27,8 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-require 'yaml'
-# rubocop:disable Style/RescueModifier
-gemfile =
-  begin
-    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
-  rescue ArgumentError
-    YAML.load_file('.overcommit.yml')['gemfile']
-  end rescue nil
+config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+gemfile = Regexp.last_match(1)
 
 if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile

From 9ce54927dda3fdc7de00fbfcf68a9ebaf9e008c3 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Mon, 27 Jan 2025 11:27:56 -0800
Subject: [PATCH 216/223] Cut version 0.65.0

---
 CHANGELOG.md              | 4 ++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ba199d2..bbe08fb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## 0.65.0
+
+* Load bundled gems on expected version
+
 ## 0.64.1
 
 * Update minimum version of rexml to address [CVE-2024-49761](https://www.ruby-lang.org/en/news/2024/10/28/redos-rexml-cve-2024-49761/)
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index afd18470..0b718a39 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.64.1'
+  VERSION = '0.65.0'
 end

From b4d4ce0e819dad926dfd0073540dd73a5217e2e9 Mon Sep 17 00:00:00 2001
From: benmelz <ben@melz.me>
Date: Wed, 29 Jan 2025 19:26:01 -0500
Subject: [PATCH 217/223] Add `-diff` cli option for running precommit hooks
 against diffs (#860)

For example, running `overcommit --diff main` from a feature branch will
run pre-commit hooks against the diff between the two branches.

I was able to very easily leverage existing code for the bulk of the
feature - this is mainly just adding the cli option, a hook context to
do the execution and some tests based on the existing `--run-all` test.

---

For background, my team is responsible for a couple of really old,
really large rails apps. Getting them completely in compliance with our
various linters is a huge task that isn't getting done anytime soon
(things are funky to the point that we've even observed breakages with
"safe" auto-correct functions).

I introduced/started heavily encouraging overcommit so that we at least
don't add _new_ linting offenses and things will naturally improve over
time. It's been great, but offenses still slip through though here and
there, especially with juniors who might be getting away with not having
a local install (and/or abusing `OVERCOMMIT_DISABLE=1`).

An option like this would allow me to leverage the very useful "only
apply to changed lines" logic within a ci environment and help enforce
my desired "no new linting offenses" policy.
---
 lib/overcommit/cli.rb                     |  23 +++-
 lib/overcommit/hook_context.rb            |   4 +-
 lib/overcommit/hook_context/base.rb       |   4 +-
 lib/overcommit/hook_context/diff.rb       |  37 ++++++
 spec/integration/diff_flag_spec.rb        |  39 ++++++
 spec/overcommit/cli_spec.rb               |  26 ++++
 spec/overcommit/hook_context/diff_spec.rb | 143 ++++++++++++++++++++++
 7 files changed, 272 insertions(+), 4 deletions(-)
 create mode 100644 lib/overcommit/hook_context/diff.rb
 create mode 100644 spec/integration/diff_flag_spec.rb
 create mode 100644 spec/overcommit/hook_context/diff_spec.rb

diff --git a/lib/overcommit/cli.rb b/lib/overcommit/cli.rb
index f8127125..dafc545a 100644
--- a/lib/overcommit/cli.rb
+++ b/lib/overcommit/cli.rb
@@ -9,6 +9,7 @@ module Overcommit
   class CLI # rubocop:disable Metrics/ClassLength
     def initialize(arguments, input, logger)
       @arguments = arguments
+      @cli_options = {}
       @input     = input
       @log       = logger
       @options   = {}
@@ -28,6 +29,8 @@ def run
         sign
       when :run_all
         run_all
+      when :diff
+        diff
       end
     rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
       puts e
@@ -45,7 +48,7 @@ def parse_arguments
       @parser = create_option_parser
 
       begin
-        @parser.parse!(@arguments)
+        @parser.parse!(@arguments, into: @cli_options)
 
         # Default action is to install
         @options[:action] ||= :install
@@ -98,6 +101,11 @@ def add_installation_options(opts)
         @options[:action] = :run_all
         @options[:hook_to_run] = arg ? arg.to_s : 'run-all'
       end
+
+      opts.on('--diff [ref]', 'Run pre_commit hooks against the diff between a given ref. Defaults to `main`.') do |arg| # rubocop:disable Layout/LineLength
+        @options[:action] = :diff
+        arg
+      end
     end
 
     def add_other_options(opts)
@@ -209,6 +217,19 @@ def run_all
       halt(status ? 0 : 65)
     end
 
+    def diff
+      empty_stdin = File.open(File::NULL) # pre-commit hooks don't take input
+      context = Overcommit::HookContext.create('diff', config, @arguments, empty_stdin, **@cli_options) # rubocop:disable Layout/LineLength
+      config.apply_environment!(context, ENV)
+
+      printer = Overcommit::Printer.new(config, log, context)
+      runner  = Overcommit::HookRunner.new(config, log, context, printer)
+
+      status = runner.run
+
+      halt(status ? 0 : 65)
+    end
+
     # Used for ease of stubbing in tests
     def halt(status = 0)
       exit status
diff --git a/lib/overcommit/hook_context.rb b/lib/overcommit/hook_context.rb
index acdff1bb..5863ed94 100644
--- a/lib/overcommit/hook_context.rb
+++ b/lib/overcommit/hook_context.rb
@@ -2,13 +2,13 @@
 
 # Utility module which manages the creation of {HookContext}s.
 module Overcommit::HookContext
-  def self.create(hook_type, config, args, input)
+  def self.create(hook_type, config, args, input, **cli_options)
     hook_type_class = Overcommit::Utils.camel_case(hook_type)
     underscored_hook_type = Overcommit::Utils.snake_case(hook_type)
 
     require "overcommit/hook_context/#{underscored_hook_type}"
 
-    Overcommit::HookContext.const_get(hook_type_class).new(config, args, input)
+    Overcommit::HookContext.const_get(hook_type_class).new(config, args, input, **cli_options)
   rescue LoadError, NameError => e
     # Could happen when a symlink was created for a hook type Overcommit does
     # not yet support.
diff --git a/lib/overcommit/hook_context/base.rb b/lib/overcommit/hook_context/base.rb
index 077394fb..b50698c9 100644
--- a/lib/overcommit/hook_context/base.rb
+++ b/lib/overcommit/hook_context/base.rb
@@ -18,10 +18,12 @@ class Base
     # @param config [Overcommit::Configuration]
     # @param args [Array<String>]
     # @param input [IO] standard input stream
-    def initialize(config, args, input)
+    # @param options [Hash] cli options
+    def initialize(config, args, input, **options)
       @config = config
       @args = args
       @input = input
+      @options = options
     end
 
     # Executes a command as if it were a regular git hook, passing all
diff --git a/lib/overcommit/hook_context/diff.rb b/lib/overcommit/hook_context/diff.rb
new file mode 100644
index 00000000..0c4b97e0
--- /dev/null
+++ b/lib/overcommit/hook_context/diff.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'overcommit/git_repo'
+
+module Overcommit::HookContext
+  # Simulates a pre-commit context based on the diff with another git ref.
+  #
+  # This results in pre-commit hooks running against the changes between the current
+  # and another ref, which is useful for automated CI scripts.
+  class Diff < Base
+    def modified_files
+      @modified_files ||= Overcommit::GitRepo.modified_files(refs: @options[:diff])
+    end
+
+    def modified_lines_in_file(file)
+      @modified_lines ||= {}
+      @modified_lines[file] ||= Overcommit::GitRepo.extract_modified_lines(file,
+                                                                           refs: @options[:diff])
+    end
+
+    def hook_class_name
+      'PreCommit'
+    end
+
+    def hook_type_name
+      'pre_commit'
+    end
+
+    def hook_script_name
+      'pre-commit'
+    end
+
+    def initial_commit?
+      @initial_commit ||= Overcommit::GitRepo.initial_commit?
+    end
+  end
+end
diff --git a/spec/integration/diff_flag_spec.rb b/spec/integration/diff_flag_spec.rb
new file mode 100644
index 00000000..dcaa1bd3
--- /dev/null
+++ b/spec/integration/diff_flag_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'overcommit --diff' do
+  subject { shell(%w[overcommit --diff main]) }
+
+  context 'when using an existing pre-commit hook script' do
+    let(:script_name) { 'test-script' }
+    let(:script_contents) { "#!/bin/bash\nexit 0" }
+    let(:script_path) { ".#{Overcommit::OS::SEPARATOR}#{script_name}" }
+
+    let(:config) do
+      {
+        'PreCommit' => {
+          'MyHook' => {
+            'enabled' => true,
+            'required_executable' => script_path,
+          }
+        }
+      }
+    end
+
+    around do |example|
+      repo do
+        File.open('.overcommit.yml', 'w') { |f| f.puts(config.to_yaml) }
+        echo(script_contents, script_path)
+        `git add #{script_path}`
+        FileUtils.chmod(0o755, script_path)
+        example.run
+      end
+    end
+
+    it 'completes successfully without blocking' do
+      wait_until(timeout: 10) { subject } # Need to wait long time for JRuby startup
+      subject.status.should == 0
+    end
+  end
+end
diff --git a/spec/overcommit/cli_spec.rb b/spec/overcommit/cli_spec.rb
index 40923ad3..3d95b09d 100644
--- a/spec/overcommit/cli_spec.rb
+++ b/spec/overcommit/cli_spec.rb
@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require 'overcommit/cli'
+require 'overcommit/hook_context/diff'
 require 'overcommit/hook_context/run_all'
 
 describe Overcommit::CLI do
@@ -125,5 +126,30 @@
         subject
       end
     end
+
+    context 'with the diff switch specified' do
+      let(:arguments) { ['--diff=some-ref'] }
+      let(:config) { Overcommit::ConfigurationLoader.default_configuration }
+
+      before do
+        cli.stub(:halt)
+        Overcommit::HookRunner.any_instance.stub(:run)
+      end
+
+      it 'creates a HookRunner with the diff context' do
+        Overcommit::HookRunner.should_receive(:new).
+          with(config,
+               logger,
+               instance_of(Overcommit::HookContext::Diff),
+               instance_of(Overcommit::Printer)).
+          and_call_original
+        subject
+      end
+
+      it 'runs the HookRunner' do
+        Overcommit::HookRunner.any_instance.should_receive(:run)
+        subject
+      end
+    end
   end
 end
diff --git a/spec/overcommit/hook_context/diff_spec.rb b/spec/overcommit/hook_context/diff_spec.rb
new file mode 100644
index 00000000..0c712fbc
--- /dev/null
+++ b/spec/overcommit/hook_context/diff_spec.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'overcommit/hook_context/diff'
+
+describe Overcommit::HookContext::Diff do
+  let(:config) { double('config') }
+  let(:args) { [] }
+  let(:input) { double('input') }
+  let(:context) { described_class.new(config, args, input, diff: 'master') }
+
+  describe '#modified_files' do
+    subject { context.modified_files }
+
+    context 'when repo contains no files' do
+      around do |example|
+        repo do
+          `git commit --allow-empty -m "Initial commit"`
+          `git checkout -b other-branch 2>&1`
+          example.run
+        end
+      end
+
+      it { should be_empty }
+    end
+
+    context 'when the repo contains files that are unchanged from the ref' do
+      around do |example|
+        repo do
+          touch('some-file')
+          `git add some-file`
+          touch('some-other-file')
+          `git add some-other-file`
+          `git commit -m "Add files"`
+          `git checkout -b other-branch 2>&1`
+          example.run
+        end
+      end
+
+      it { should be_empty }
+    end
+
+    context 'when repo contains files that have been changed from the ref' do
+      around do |example|
+        repo do
+          touch('some-file')
+          `git add some-file`
+          touch('some-other-file')
+          `git add some-other-file`
+          `git commit -m "Add files"`
+          `git checkout -b other-branch 2>&1`
+          File.open('some-file', 'w') { |f| f.write("hello\n") }
+          `git add some-file`
+          `git commit -m "Edit file"`
+          example.run
+        end
+      end
+
+      it { should == %w[some-file].map { |file| File.expand_path(file) } }
+    end
+
+    context 'when repo contains submodules' do
+      around do |example|
+        submodule = repo do
+          touch 'foo'
+          `git add foo`
+          `git commit -m "Initial commit"`
+        end
+
+        repo do
+          `git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
+          `git commit --allow-empty -m "Initial commit"`
+          `git checkout -b other-branch 2>&1`
+          example.run
+        end
+      end
+
+      it { should_not include File.expand_path('test-sub') }
+    end
+  end
+
+  describe '#modified_lines_in_file' do
+    let(:modified_file) { 'some-file' }
+    subject { context.modified_lines_in_file(modified_file) }
+
+    context 'when file contains a trailing newline' do
+      around do |example|
+        repo do
+          touch(modified_file)
+          `git add #{modified_file}`
+          `git commit -m "Add file"`
+          `git checkout -b other-branch 2>&1`
+          File.open(modified_file, 'w') { |f| (1..3).each { |i| f.write("#{i}\n") } }
+          `git add #{modified_file}`
+          `git commit -m "Edit file"`
+          example.run
+        end
+      end
+
+      it { should == Set.new(1..3) }
+    end
+
+    context 'when file does not contain a trailing newline' do
+      around do |example|
+        repo do
+          touch(modified_file)
+          `git add #{modified_file}`
+          `git commit -m "Add file"`
+          `git checkout -b other-branch 2>&1`
+          File.open(modified_file, 'w') do |f|
+            (1..2).each { |i| f.write("#{i}\n") }
+            f.write(3)
+          end
+          `git add #{modified_file}`
+          `git commit -m "Edit file"`
+          example.run
+        end
+      end
+
+      it { should == Set.new(1..3) }
+    end
+  end
+
+  describe '#hook_type_name' do
+    subject { context.hook_type_name }
+
+    it { should == 'pre_commit' }
+  end
+
+  describe '#hook_script_name' do
+    subject { context.hook_script_name }
+
+    it { should == 'pre-commit' }
+  end
+
+  describe '#initial_commit?' do
+    subject { context.initial_commit? }
+
+    before { Overcommit::GitRepo.stub(:initial_commit?).and_return(true) }
+
+    it { should == true }
+  end
+end

From 43e17fb384e51101cd45449e03d39188f18959f9 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Wed, 29 Jan 2025 16:32:23 -0800
Subject: [PATCH 218/223] Cut version 0.66.0 (#861)

---
 CHANGELOG.md              | 4 ++++
 README.md                 | 1 +
 lib/overcommit/version.rb | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbe08fb9..d82b5b50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## 0.66.0
+
+* Add `--diff` CLI option for running pre-commit hooks against only changed files
+
 ## 0.65.0
 
 * Load bundled gems on expected version
diff --git a/README.md b/README.md
index 877e9396..a0d46726 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,7 @@ Command Line Flag         | Description
 `-f`/`--force`            | Don't bail on install if other hooks already exist--overwrite them
 `-l`/`--list-hooks`       | Display all available hooks in the current repository
 `-r`/`--run`              | Run pre-commit hook against all tracked files in repository
+`--diff <ref>`            | Run pre-commit hook against all changed files relative to `<ref>`
 `-t`/`--template-dir`     | Print location of template directory
 `-h`/`--help`             | Show command-line flag documentation
 `-v`/`--version`          | Show version
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 0b718a39..c1091e52 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.65.0'
+  VERSION = '0.66.0'
 end

From 3db733e5b7dd479baee1c8e587aa86ed73e5011f Mon Sep 17 00:00:00 2001
From: Matt Brictson <matt@mattbrictson.com>
Date: Sun, 16 Feb 2025 13:04:54 -0800
Subject: [PATCH 219/223] Restore ability to specify "gemfile: false" in config
 (#863)

Setting `gemfile: false` in `.overcommit.yml` is supposed to disable
Bundler. However, a recently-introduced bug causes `false` to be
interpreted as the name of the gemfile. Bundler looks for a gemfile
named "false", which fails, leading overcommit's hooks to crash.

This PR fixes the bug by adjusting the regex used to parse the
`gemfile:` line in the config. Now, `false` is no longer interpreted as
a gemfile name.

I added an integration test to verify the fix.

Fixes #862
---
 spec/integration/gemfile_option_spec.rb | 211 +++++++++++++++---------
 template-dir/hooks/commit-msg           |   2 +-
 template-dir/hooks/overcommit-hook      |   2 +-
 template-dir/hooks/post-checkout        |   2 +-
 template-dir/hooks/post-commit          |   2 +-
 template-dir/hooks/post-merge           |   2 +-
 template-dir/hooks/post-rewrite         |   2 +-
 template-dir/hooks/pre-commit           |   2 +-
 template-dir/hooks/pre-push             |   2 +-
 template-dir/hooks/pre-rebase           |   2 +-
 template-dir/hooks/prepare-commit-msg   |   2 +-
 11 files changed, 144 insertions(+), 87 deletions(-)

diff --git a/spec/integration/gemfile_option_spec.rb b/spec/integration/gemfile_option_spec.rb
index 7a0175da..a6a6a4ba 100644
--- a/spec/integration/gemfile_option_spec.rb
+++ b/spec/integration/gemfile_option_spec.rb
@@ -3,99 +3,156 @@
 require 'spec_helper'
 
 describe 'specifying `gemfile` option in Overcommit configuration' do
-  let(:repo_root) { File.expand_path(File.join('..', '..'), File.dirname(__FILE__)) }
-  let(:fake_gem_path) { File.join('lib', 'my_fake_gem') }
-
-  # We point the overcommit gem back to this repo since we can't assume the gem
-  # has already been installed in a test environment
-  let(:gemfile) { normalize_indent(<<-RUBY) }
-    source 'https://rubygems.org'
-
-    gem 'overcommit', path: '#{repo_root}'
-    gem 'my_fake_gem', path: '#{fake_gem_path}'
-    gem 'ffi' if Gem.win_platform? # Necessary for test to pass on Windows
-  RUBY
-
-  let(:gemspec) { normalize_indent(<<-RUBY) }
-    Gem::Specification.new do |s|
-      s.name = 'my_fake_gem'
-      s.version = '1.0.0'
-      s.author = 'John Doe'
-      s.license = 'MIT'
-      s.homepage = 'https://example.com'
-      s.email = 'john.doe@example.com'
-      s.summary = 'A fake gem'
-      s.files = [File.join('lib', 'my_fake_gem.rb')]
-    end
-  RUBY
-
-  # Specify a hook that depends on an external gem to test Gemfile loading
-  let(:hook) { normalize_indent(<<-RUBY) }
-    module Overcommit::Hook::PreCommit
-      class FakeHook < Base
-        def run
-          require 'my_fake_gem'
-          :pass
+  context 'given a project that uses a Gemfile' do
+    let(:repo_root) { File.expand_path(File.join('..', '..'), File.dirname(__FILE__)) }
+    let(:fake_gem_path) { File.join('lib', 'my_fake_gem') }
+
+    # We point the overcommit gem back to this repo since we can't assume the gem
+    # has already been installed in a test environment
+    let(:gemfile) { normalize_indent(<<-RUBY) }
+      source 'https://rubygems.org'
+
+      gem 'overcommit', path: '#{repo_root}'
+      gem 'my_fake_gem', path: '#{fake_gem_path}'
+      gem 'ffi' if Gem.win_platform? # Necessary for test to pass on Windows
+    RUBY
+
+    let(:gemspec) { normalize_indent(<<-RUBY) }
+      Gem::Specification.new do |s|
+        s.name = 'my_fake_gem'
+        s.version = '1.0.0'
+        s.author = 'John Doe'
+        s.license = 'MIT'
+        s.homepage = 'https://example.com'
+        s.email = 'john.doe@example.com'
+        s.summary = 'A fake gem'
+        s.files = [File.join('lib', 'my_fake_gem.rb')]
+      end
+    RUBY
+
+    # Specify a hook that depends on an external gem to test Gemfile loading
+    let(:hook) { normalize_indent(<<-RUBY) }
+      module Overcommit::Hook::PreCommit
+        class FakeHook < Base
+          def run
+            require 'my_fake_gem'
+            :pass
+          end
+        end
+      end
+    RUBY
+
+    let(:config) { normalize_indent(<<-YAML) }
+      verify_signatures: false
+
+      CommitMsg:
+        ALL:
+          enabled: false
+
+      PreCommit:
+        ALL:
+          enabled: false
+        FakeHook:
+          enabled: true
+          requires_files: false
+    YAML
+
+    around do |example|
+      repo do
+        # Since RSpec is being run within a Bundler context we need to clear it
+        # in order to not taint the test
+        Bundler.with_unbundled_env do
+          FileUtils.mkdir_p(File.join(fake_gem_path, 'lib'))
+          echo(gemspec, File.join(fake_gem_path, 'my_fake_gem.gemspec'))
+          touch(File.join(fake_gem_path, 'lib', 'my_fake_gem.rb'))
+
+          echo(gemfile, '.overcommit_gems.rb')
+          `bundle install --gemfile=.overcommit_gems.rb`
+
+          echo(config, '.overcommit.yml')
+
+          # Set BUNDLE_GEMFILE so we load Overcommit from the current repo
+          ENV['BUNDLE_GEMFILE'] = '.overcommit_gems.rb'
+          `bundle exec overcommit --install > #{File::NULL}`
+          FileUtils.mkdir_p(File.join('.git-hooks', 'pre_commit'))
+          echo(hook, File.join('.git-hooks', 'pre_commit', 'fake_hook.rb'))
+
+          Overcommit::Utils.with_environment 'OVERCOMMIT_NO_VERIFY' => '1' do
+            example.run
+          end
         end
       end
     end
-  RUBY
-
-  let(:config) { normalize_indent(<<-YAML) }
-    verify_signatures: false
-
-    CommitMsg:
-      ALL:
-        enabled: false
-
-    PreCommit:
-      ALL:
-        enabled: false
-      FakeHook:
-        enabled: true
-        requires_files: false
-  YAML
-
-  around do |example|
-    repo do
-      # Since RSpec is being run within a Bundler context we need to clear it
-      # in order to not taint the test
-      Bundler.with_unbundled_env do
-        FileUtils.mkdir_p(File.join(fake_gem_path, 'lib'))
-        echo(gemspec, File.join(fake_gem_path, 'my_fake_gem.gemspec'))
-        touch(File.join(fake_gem_path, 'lib', 'my_fake_gem.rb'))
-
-        echo(gemfile, '.overcommit_gems.rb')
-        `bundle install --gemfile=.overcommit_gems.rb`
 
+    subject { shell(%w[git commit --allow-empty -m Test]) }
+
+    context 'when configuration specifies the gemfile' do
+      let(:config) { "gemfile: .overcommit_gems.rb\n" + super() }
+
+      it 'runs the hook successfully' do
+        subject.status.should == 0
+      end
+    end
+
+    context 'when configuration does not specify the gemfile' do
+      it 'fails to run the hook' do
+        subject.status.should_not == 0
+      end
+    end
+  end
+
+  context 'given a project that does not use a Gemfile' do
+    let(:hook) { normalize_indent(<<-RUBY) }
+      module Overcommit::Hook::PreCommit
+        class NoInvalidGemfileHook < Base
+          def run
+            if (gemfile = ENV["BUNDLE_GEMFILE"])
+              raise unless File.exist?(gemfile)
+            end
+
+            :pass
+          end
+        end
+      end
+    RUBY
+
+    let(:config) { normalize_indent(<<-YAML) }
+      verify_signatures: false
+
+      CommitMsg:
+        ALL:
+          enabled: false
+
+      PreCommit:
+        ALL:
+          enabled: false
+        NoInvalidGemfileHook:
+          enabled: true
+          requires_files: false
+    YAML
+
+    around do |example|
+      repo do
         echo(config, '.overcommit.yml')
 
-        # Set BUNDLE_GEMFILE so we load Overcommit from the current repo
-        ENV['BUNDLE_GEMFILE'] = '.overcommit_gems.rb'
-        `bundle exec overcommit --install > #{File::NULL}`
+        `overcommit --install > #{File::NULL}`
         FileUtils.mkdir_p(File.join('.git-hooks', 'pre_commit'))
-        echo(hook, File.join('.git-hooks', 'pre_commit', 'fake_hook.rb'))
+        echo(hook, File.join('.git-hooks', 'pre_commit', 'no_invalid_gemfile_hook.rb'))
 
         Overcommit::Utils.with_environment 'OVERCOMMIT_NO_VERIFY' => '1' do
           example.run
         end
       end
     end
-  end
-
-  subject { shell(%w[git commit --allow-empty -m Test]) }
 
-  context 'when configuration specifies the gemfile' do
-    let(:config) { "gemfile: .overcommit_gems.rb\n" + super() }
+    subject { shell(%w[git commit --allow-empty -m Test]) }
 
-    it 'runs the hook successfully' do
-      subject.status.should == 0
-    end
-  end
+    context 'when configuration explicitly sets the gemfile to false' do
+      let(:config) { "gemfile: false\n" + super() }
 
-  context 'when configuration does not specify the gemfile' do
-    it 'fails to run the hook' do
-      subject.status.should_not == 0
+      it 'runs the hook successfully' do
+        subject.status.should == 0
+      end
     end
   end
 end
diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/commit-msg
+++ b/template-dir/hooks/commit-msg
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/overcommit-hook
+++ b/template-dir/hooks/overcommit-hook
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/post-checkout
+++ b/template-dir/hooks/post-checkout
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/post-commit
+++ b/template-dir/hooks/post-commit
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/post-merge
+++ b/template-dir/hooks/post-merge
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/post-rewrite
+++ b/template-dir/hooks/post-rewrite
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/pre-commit
+++ b/template-dir/hooks/pre-commit
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/pre-push
+++ b/template-dir/hooks/pre-push
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/pre-rebase
+++ b/template-dir/hooks/pre-rebase
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
index 377c892b..87ffeb58 100755
--- a/template-dir/hooks/prepare-commit-msg
+++ b/template-dir/hooks/prepare-commit-msg
@@ -27,7 +27,7 @@ if hook_type == 'overcommit-hook'
 end
 
 # Check if Overcommit should invoke a Bundler context for loading gems
-config = File.read('.overcommit.yml') =~ /gemfile: ['"]?(.*)['"]?/
+File.read('.overcommit.yml') =~ /gemfile: (?:false|['"]?(.*)['"]?)/
 gemfile = Regexp.last_match(1)
 
 if gemfile

From 88bee0845bff4142642253f89aabaa9fd318465b Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 16 Feb 2025 13:08:25 -0800
Subject: [PATCH 220/223] Cut version 0.67.0 (#864)

---
 CHANGELOG.md              | 4 ++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d82b5b50..8b99417a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## 0.67.0
+
+* Fix bug introduced in 0.65.0 that prevented `gemfile: false` from working correctly
+
 ## 0.66.0
 
 * Add `--diff` CLI option for running pre-commit hooks against only changed files
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index c1091e52..803dbbfc 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.66.0'
+  VERSION = '0.67.0'
 end

From 9f142c2a4f66a63e27ae2e5c64f507fc36f3807b Mon Sep 17 00:00:00 2001
From: Pedro Fayolle <pfayolle@gmail.com>
Date: Thu, 20 Feb 2025 03:17:00 +0900
Subject: [PATCH 221/223] Add note about unsupported YAML features in
 `gemfile:` line in default.yml (#865)

Related to #863 and [this
comment](https://github.com/sds/overcommit/issues/862#issuecomment-2641924147):

> Having a similar problem since we had this line in our
`.overcommit.yml`:
>
> ```yaml
> gemfile: Gemfile # enforce bundled version of overcommit
> ```
>
> And now overcommit doesn't strip out the inline comment, resulting in
this weird looking error message:
>
> ```
> Problem loading 'Gemfile # enforce bundled version of overcommit':
/path/to/project/Gemfile # enforce bundled version of overcommit not
found
> ```

I think adding support for comments in the `gemfile:` regexp is likely
overkill and may still not be enough when the next person tries to use
yet another YAML feature in that line, but perhaps this little warning
would help someone else avoid tripping.
---
 config/default.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/default.yml b/config/default.yml
index 70ae0b2d..ba8af533 100644
--- a/config/default.yml
+++ b/config/default.yml
@@ -32,6 +32,10 @@
 # your repository, and then set the `gemfile` option below to the name you gave
 # the file.
 # (Generate lock file by running `bundle install --gemfile=.overcommit_gems.rb`)
+#
+# NOTE: the following line will be parsed by a regexp rather than a proper YAML
+# parser, so avoid any values other than false or a string, and don't use inline
+# comments
 gemfile: false
 
 # Where to store hook plugins specific to a repository. These are loaded in

From 11ef06b6eb3398e5891e8d9d2698c4edf2318f1f Mon Sep 17 00:00:00 2001
From: raul <rascnt@gmail.com>
Date: Mon, 3 Mar 2025 07:22:25 +0100
Subject: [PATCH 222/223] adds 'set' requirements to diff hook context. (#866)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Running `overcommit` with the `--diff` flag results in errors for
version `0.67.0`.

```sh
bundle exec overcommit --diff HEAD
```

It results on the following:

```ruby
Running pre-commit hooks
Check for case-insensitivity conflicts................[CaseConflicts] FAILED
Hook raised unexpected error
uninitialized constant Overcommit::Hook::PreCommit::CaseConflicts::Set

      repo_files = Set.new(applicable_files)
                   ^^^
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook/pre_commit/case_conflicts.rb:8:in `run'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook/base.rb:47:in `block in run_and_transform'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/utils.rb:260:in `with_environment'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook/base.rb:47:in `run_and_transform'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:162:in `run_hook'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:98:in `block in consume'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:94:in `loop'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:94:in `consume'
Analyze with RuboCop........................................[RuboCop] FAILED
Hook raised unexpected error
uninitialized constant Overcommit::GitRepo::Set

      lines = Set.new
              ^^^
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/git_repo.rb:69:in `extract_modified_lines'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_context/diff.rb:17:in `modified_lines_in_file'
/nix/store/0sj7d3r1kf95f27028j93j0sx3v6p1kw-ruby-3.1.6/lib/ruby/3.1.0/forwardable.rb:238:in `modified_lines_in_file'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/message_processor.rb:145:in `message_on_modified_line?'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/message_processor.rb:138:in `block in remove_ignored_messages'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/message_processor.rb:138:in `select'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/message_processor.rb:138:in `remove_ignored_messages'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/message_processor.rb:45:in `handle_modified_lines'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/message_processor.rb:39:in `hook_result'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook/base.rb:263:in `process_hook_return_value'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook/base.rb:48:in `run_and_transform'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:162:in `run_hook'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:98:in `block in consume'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:94:in `loop'
.bundle/ruby/3.1.0/gems/overcommit-0.67.0/lib/overcommit/hook_runner.rb:94:in `consume'

✗ One or more pre-commit hooks failed
```

The problems are fixed once `set` is required in the context that the
sub command is run.

`run_all.rb` also requires `set` where the module is
[defined](https://github.com/sds/overcommit/blob/main/lib/overcommit/hook_context/run_all.rb#L3).
---
 lib/overcommit/hook_context/diff.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/overcommit/hook_context/diff.rb b/lib/overcommit/hook_context/diff.rb
index 0c4b97e0..3e9aa568 100644
--- a/lib/overcommit/hook_context/diff.rb
+++ b/lib/overcommit/hook_context/diff.rb
@@ -2,6 +2,8 @@
 
 require 'overcommit/git_repo'
 
+require 'set'
+
 module Overcommit::HookContext
   # Simulates a pre-commit context based on the diff with another git ref.
   #

From 46c303377c495b1455531218f195c61243a61655 Mon Sep 17 00:00:00 2001
From: Shane da Silva <shane@dasilva.io>
Date: Sun, 2 Mar 2025 22:23:44 -0800
Subject: [PATCH 223/223] Cut version 0.67.1

---
 CHANGELOG.md              | 4 ++++
 lib/overcommit/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b99417a..ad1cb477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Overcommit Changelog
 
+## 0.67.1
+
+* Fix `set` gem dependency error when running with `--diff` flag
+
 ## 0.67.0
 
 * Fix bug introduced in 0.65.0 that prevented `gemfile: false` from working correctly
diff --git a/lib/overcommit/version.rb b/lib/overcommit/version.rb
index 803dbbfc..872c5327 100644
--- a/lib/overcommit/version.rb
+++ b/lib/overcommit/version.rb
@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.67.0'
+  VERSION = '0.67.1'
 end