git_commands 3.2.9 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc41c685ee29b19f620cbf0048aabc586edd6afe
-  data.tar.gz: b0f79689c6acfff02ba0063949758c9882b56047
+  metadata.gz: 4794d0456217191d8939a0bf9c547221176e6ecb
+  data.tar.gz: ddb26bbffe05ef5ec8f997f889aded4fee03201b
 SHA512:
-  metadata.gz: 68a1bfc9f4ebd26648c29150a8d12a019cee51338d39e05de19bdae3202bdd74ea549595b644d710ed9ffef5655bacacc9dbba0003e6a66e24f08eb0d232d812
-  data.tar.gz: d6328e5ff3d553be85d27572e62160b7bafbd727af9e01f0ec45ead34e6415aaf076359ed290da75dc5d8620f874c325d595bc923d0163375657a375b523beb3
+  metadata.gz: b6d7669adc0eacc64866b606b5f1aa7a437708ed4f7ddb78a15d13a46bbabfddda4d7c75869bbaa47f1f378c8ab66ed336ffa798d59b32b970fd60010b26a545
+  data.tar.gz: e850c3d49d5ed95020bfc5bebaff07ef91aabb968c88d615cd76f7421c89cb51b7dd28e6cca61e731a08288e8e4a02ed112bf0b24a87f8cfb48e5ba5422121a8

data/lib/git_commands/computer.rb

@@ -42,7 +42,7 @@ module GitCommands
             warning("Rebasing branch: #{branch}")
             `git checkout #{branch}`
             `git pull origin #{branch}`
-            next unless rebase_with_master
+            next unless rebase_with
             `git push -f origin #{branch}`
             success("Rebased successfully!")
           end
@@ -60,8 +60,8 @@ module GitCommands
           @branches.each do |branch|
             warning("Merging branch: #{branch}")
             `git checkout -b #{temp} origin/#{branch} --no-track`
-            remove_locals([temp, release]) && exit unless rebase_with_master
-            `git rebase #{release}`
+            clean_and_exit([temp, release]) unless rebase_with
+            clean_and_exit([temp]) unless rebase_with(release)
             `git checkout #{release}`
             `git merge #{temp}`
             `git branch -D #{temp}`
@@ -91,6 +91,13 @@ module GitCommands
       error("Got conflicts, aborting rebase!")
     end
 
+    private def rebase_with(branch = "#{Branch::ORIGIN}#{Branch::MASTER}")
+      `git rebase #{branch}`
+      return true unless @repo.locked?
+      @repo.unlock
+      error("Got conflicts, aborting rebase with #{branch}!")
+    end
+
     private def enter_repo
       Dir.chdir(@repo) do
         pull_master
@@ -104,5 +111,10 @@ module GitCommands
         `git branch -D #{branch}`
       end
     end
+
+    private def clean_and_exit(branches)
+      remove_locals(branches)
+      exit
+    end
   end
 end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.9"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.3.0
 platform: ruby
 authors:
 - costajob