overcommit 0.60.0 → 0.62.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b862ff3b0a2650cafbdbc91fac3cda5ee83292ee0057e0446c954c555870ca76
|
4
|
+
data.tar.gz: 50924c1e042458f471c130d17b9b3504938b6a8246d170c7a9eedcf24ed14424
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 872f9fb0720e7a5bebb76bf12faefcd7c8cd03927f1cf084d71115049edbe09ddc143d62f1c91548ea178ad9bd36a08685af3ea3bf552a6ab982cc5feac581e0
|
7
|
+
data.tar.gz: 679b25b4f585a2031313798f422c6eb3ee07eff900dbb6d94a1d17f8bd62a474a1cde65a2acc51b310ae26dc55a0f0350b0e27a33029d5c7c64058b6b9ea62dd
|
@@ -70,11 +70,9 @@ module Overcommit
|
|
70
70
|
# Loads a configuration, ensuring it extends the default configuration.
|
71
71
|
def load_file(file, local_file = nil)
|
72
72
|
overcommit_config = self.class.load_from_file(file, default: false, logger: @log)
|
73
|
-
if local_file
|
74
|
-
local_config = self.class.load_from_file(local_file, default: false, logger: @log)
|
75
|
-
end
|
73
|
+
l_config = self.class.load_from_file(local_file, default: false, logger: @log) if local_file
|
76
74
|
config = self.class.default_configuration.merge(overcommit_config)
|
77
|
-
config =
|
75
|
+
config = config.merge(l_config) if l_config
|
78
76
|
|
79
77
|
if @options.fetch(:verify) { config.verify_signatures? }
|
80
78
|
verify_signatures(config)
|
data/lib/overcommit/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: overcommit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.62.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shane da Silva
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-01-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: childprocess
|
@@ -19,7 +19,7 @@ dependencies:
|
|
19
19
|
version: 0.6.3
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: '
|
22
|
+
version: '6'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -29,7 +29,7 @@ dependencies:
|
|
29
29
|
version: 0.6.3
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: '
|
32
|
+
version: '6'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: iniparse
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
@@ -318,8 +318,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
318
318
|
- !ruby/object:Gem::Version
|
319
319
|
version: '0'
|
320
320
|
requirements: []
|
321
|
-
rubygems_version: 3.
|
322
|
-
signing_key:
|
321
|
+
rubygems_version: 3.4.10
|
322
|
+
signing_key:
|
323
323
|
specification_version: 4
|
324
324
|
summary: Git hook manager
|
325
325
|
test_files: []
|