Trying to fix the verify loop

sds · Sep 22, 2023 · 3fec9a7 · 3fec9a7
1 parent bf04714
commit 3fec9a7
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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
+      local_config = self.class.load_from_file(local_file, default: false, logger: @log) if local_file
       config = self.class.default_configuration.merge(overcommit_config)
-      config = config.merge(local_config) if local_config
+      config.merge(local_config) if local_config
 
       if @options.fetch(:verify) { config.verify_signatures? }
         verify_signatures(config)