git_commands 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a6f8395baa1fb4d58f303328df32879e9f2fde
-  data.tar.gz: b2868ae612d6128188cd940e8e25bf36ad301ce1
+  metadata.gz: 6830212ac9292f6ab9a440be58462c0700e0aca5
+  data.tar.gz: 6dc1beacbc1d9d38805401e989f32810ac2b329b
 SHA512:
-  metadata.gz: c4f5c35d40aa43b150264c28dd056e1252ac18ebeece5db18c315173a8d3ebcf34933dbad57d9e10db517616ce806981dc1c2ce076dbc06927a1ad723aaf7253
-  data.tar.gz: cac97ac9121721c40287714f5794a1b1fcc7bed5516ed839c15c27627d87bbbf584fb64b92eecf6d3f45f74d062180867e7a769c91e898019f16972bf75eb5fa
+  metadata.gz: 27b6cd41ea7fdb45082b63e2c4d9eb5f6f5cd4f300897eeb64e4347d45f73c0f787dbfaedf010c3c9645b4b6e0f333947f3fea3e1ce344c2042c7bb17eaf9114
+  data.tar.gz: b958bd9a4abd7833b8a42b6220b5ad238223a2aa363b835e92d575eb67c425f45c11548da74c31c669cbea11186111e0c12b9440312b91cff3adc22c62b6009b

data/lib/git_commands/command.rb

@@ -44,7 +44,7 @@ module GitCommands
             warning("Rebasing branch: #{branch}")
             `git checkout #{branch}`
             `git pull origin #{branch}`
-            next unless rebase_with_master
+            next unless rebase_with_master(branch)
             `git push -f origin #{branch}`
             `git checkout #{Branch::MASTER}`
             `git branch -D #{branch}`
@@ -63,7 +63,7 @@ module GitCommands
           @branches.each do |branch|
             warning("Merging branch: #{branch}")
             `git checkout -b #{temp} origin/#{branch} --no-track`
-            next unless rebase_with_master
+            next unless rebase_with_master(branch)
             `git rebase #{aggregate}`
             `git checkout #{aggregate}`
             `git merge #{temp}`
@@ -88,10 +88,12 @@ module GitCommands
       `git pull`
     end
 
-    private def rebase_with_master
+    private def rebase_with_master(branch)
       `git rebase origin/#{Branch::MASTER}`
       return true unless @repo.locked?
       `git rebase --abort`
+      `git checkout #{Branch::MASTER}`
+      `git branch -D #{branch}`
       error("Got conflicts, skipping rebase!")
     end
 

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

metadata

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