git-review 1.0.3 → 1.0.5

data/lib/git-review.rb

@@ -337,9 +337,9 @@ class GitReview
   # Delete local and remote branches that match a given name.
   def delete_branch(branch_name)
     # Delete local branch if it exists.
-    git_call("branch -D #{branch_name}") if branch_exists?(:local, branch_name)
+    git_call("branch -D #{branch_name}", true) if branch_exists?(:local, branch_name)
     # Delete remote branch if it exists.
-    git_call("push origin :#{branch_name}") if branch_exists?(:remote, branch_name)
+    git_call("push origin :#{branch_name}", true) if branch_exists?(:remote, branch_name)
   end
 
   # Returns a boolean stating whether there are unmerged commits on the local or remote branch.
@@ -356,9 +356,9 @@ class GitReview
     responses = locations.collect do |location|
       git_call "cherry #{location.first}#{target_branch} #{location.last}#{branch_name}"
     end
-    # Select commits (= non empty and not just an error message).
-    unmerged_commits = responses.select do |response|
-      not (response.empty? or response.include?('fatal: Unknown commit'))
+    # Select commits (= non empty, not just an error message and not only duplicate commits staring with '-').
+    unmerged_commits = responses.reject do |response|
+      response.empty? or response.include?('fatal: Unknown commit') or response.split("\n").reject{|x| x.index('-') == 0}.empty?
     end
     # If the array ain't empty, we got unmerged commits.
     if unmerged_commits.empty?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Dominik Bamberger