git-review 1.1.2 → 1.1.3

data/lib/git-review.rb

@@ -79,16 +79,17 @@ class GitReview
   def merge
     return unless request_exists?
     option = @args.shift
-    unless @current_request['head']['repository']
+    unless @current_request['head']['repo']
       # Someone deleted the source repo.
       user = @current_request['head']['user']['login']
       url = @current_request['patch_url']
       puts "Sorry, #{user} deleted the source repository, git-review doesn't support this."
-      puts 'You can manually patch your repo by running:'
+      puts 'Tell the contributor not to do this.'
+      puts
+      puts 'You can still manually patch your repo by running:'
       puts
       puts "  curl #{url} | git am"
       puts
-      puts 'Tell the contributor not to do this.'
       return false
     end
     message = "Accept request ##{@current_request['number']} and merge changes into \"#{target}\""
@@ -125,10 +126,12 @@ class GitReview
   # Prepare local repository to create a new request.
   # Sets @local_branch.
   def prepare
+    # Remember original branch the user was currently working on.
+    @original_branch = source_branch
     # People should work on local branches, but especially for single commit changes,
     # more often than not, they don't. Therefore we create a branch for them,
     # to be able to use code review the way it is intended.
-    if source_branch == target_branch
+    if @original_branch == target_branch
       # Unless a branch name is already provided, ask for one.
       if (branch_name = @args.shift).nil?
         puts 'Please provide a name for the branch:'
@@ -147,7 +150,7 @@ class GitReview
         git_call('stash pop') if save_uncommitted_changes
       end
     else
-      @local_branch = source_branch
+      @local_branch = @original_branch
     end
   end
 
@@ -178,6 +181,8 @@ class GitReview
       if potential_new_request and potential_new_request['number'] > last_request_id
         puts "Successfully created new request ##{potential_new_request['number']}."
       end
+      # Return to the user's original branch.
+      git_call "checkout #{@original_branch}"
     else
       puts 'Nothing to push to remote yet. Commit something first.'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-review
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy