multi_repo 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 569dd39745ef1ab573d95ef3c1724aed8c96afb4fddc72d09c7f24774acce7f8
-  data.tar.gz: 9272ee6b4996a0f28a5d5af60c9ed201845306cde7f4ceafb67aec473417733d
+  metadata.gz: 363ca04276f3d649809c39b6fb2edb051e2eb51f8fd87f945409d08172984e0d
+  data.tar.gz: 8267789b5af70973998fb0ecb0e59107347f7e6403a746fa98c0bc5f43a93f3c
 SHA512:
-  metadata.gz: 56011154b9371332679c7d46a78c0bf7c125acce711dcd5e36ecb0c2960c96b2136b103b51fc675a7b5bc6dec4d352794c7f4b77cf4816ea032e26e38d1cd988
-  data.tar.gz: d18605c473b2bc80bf3805bfa53048eae473f99488843b863fe697443df30a2239436021cd2901f038982c01dadc71170b361f99ee034890bdd6bc0d22ca0af1
+  metadata.gz: 501f688e2084d24d9bcb39633d974bb08cbb97c8586d25983d1a7d76f41cf4d37836f7455f6d81addff4d03c40655c10a79b668f42a12eee61f378807f06784e
+  data.tar.gz: 43f1aff7d976517022e22ce9903fd21ea20367b2e155bd418c03d66cb960026f0ff0f43b953382b703c3badd47d65e1761234c47325803e07ca0df0e4b000a01

data/lib/multi_repo/helpers/git_mirror.rb

@@ -164,7 +164,7 @@ module MultiRepo::Helpers
 
       success =
         system("git checkout -B #{dest_name} #{start_point}") &&
-        system("git pull --rebase=merges #{source_remote} #{source_name}") &&
+        system("git pull --no-rebase #{source_remote} #{source_name}") &&
         system("git push -f #{dest_remote} #{dest_name}")
 
       if backup_remote_defined?

data/lib/multi_repo/version.rb

@@ -1,3 +1,3 @@
 module MultiRepo
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

data/multi_repo.gemspec

@@ -36,6 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "travis"
 
+  # config gem brings in newer versions of dry-configurable that are not compatible with Ruby 2.7
+  spec.add_runtime_dependency "dry-configurable", "= 1.0.1"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_repo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement