git-review 0.6.5 → 0.6.6

data/lib/git-review.rb

@@ -98,11 +98,12 @@ class GitReview
       puts 'Tell the contributor not to do this.'
       return false
     end
-    message = "Accepting request ##{@pending_request['number']} and merging into \"#{target}>\""
-    exec_cmd = "merge --no-ff #{option} -m '#{message}' #{@pending_request['head']['sha']}"
+    message = "Accept request ##{@pending_request['number']} and merge changes into \"#{target}\""
+    exec_cmd = "merge #{option} -m '#{message}' #{@pending_request['head']['sha']}"
     puts
     puts 'Request title:'
     puts "  #{@pending_request['title']}"
+    puts
     puts 'Merge command:'
     puts "  git #{exec_cmd}"
     puts
@@ -174,8 +175,11 @@ class GitReview
       return false
     end
     @pending_request = @pending_requests.find{ |req| req['number'] == request_id }
-    puts "Request '#{request_id}' does not exist." unless @pending_request
-    not @pending_request.nil?
+    if @pending_request.nil?
+      puts "Request '#{request_id}' does not exist."
+      return false
+    end
+    true
   end
 
   # Get latest changes from GitHub.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-review
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Dominik Bamberger, Cristian Messel