overcommit 0.60.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9628c356de69c116c7a315732abfe802f91578cbcf2665c450ec7bfeddfd297
-  data.tar.gz: b0f5f78774b47295f7200ea994a1dfa9d05eb9155d57f31a2f95ee7a60ed6d1f
+  metadata.gz: 6ecfff59af8eed6358b9f6b03d50d6378ac9cd9ae5bd48b7cd5a2e8110223562
+  data.tar.gz: 340214649a288a6728a37fdf827bbf4ff35d1940201a009dcfe3feae005839aa
 SHA512:
-  metadata.gz: 9b6a07c9a752bb5ce51f432b51c43f4f225ba2891806ca1deb1ac8e77134ad4ebfa26dbb5050393f9d4529fc1a9df18fee84f4c59dc418a534002dd817bae90e
-  data.tar.gz: 24b3f6be4e83a9e7167d7f66d5d2179be00777aa5209bfce778fc33b297a57ad045164421a9d46f8c66ffb6c2274af556dcbd87d0b2fecfe3000024c23eeb673
+  metadata.gz: 1210bc1c11220a462ed4e2f4f75e6becb3e97472d74787be10321f08a233238c8f3071a0dc6bfcf848060c351906d69f9122d670bf8ad91f6b9ea6110c5dffc2
+  data.tar.gz: 3963037483e0a132b9b6ce6da860f23e33f7b309c4b67fced3497f034544b98966469232a6f1195db737ef6ff5d4ce5d2436ae72b6a323d80fc91624b8d449af

data/lib/overcommit/configuration_loader.rb

@@ -70,11 +70,9 @@ module Overcommit
     # 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)

data/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb

@@ -85,7 +85,7 @@ module Overcommit::Hook::PrepareCommitMsg
     end
 
     def skip?
-      skipped_commit_types.include?(commit_message_source)
+      super || skipped_commit_types.include?(commit_message_source)
     end
   end
 end

data/lib/overcommit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.60.0
+  version: 0.61.0
 platform: ruby
 authors:
 - Shane da Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -318,8 +318,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Git hook manager
 test_files: []