git_pr 0.0.14.beta12 → 0.0.14.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7426b71322589245f7c578dcce72fd039ee6728e
-  data.tar.gz: d797a06e652ec4e5d1c5f389db7281fff0c9d21b
+  metadata.gz: 9af4b86e0e341d7d744ae5afa8d4e74302e19272
+  data.tar.gz: 0a4ac4c9e319ddee330a21780a45a6c5ae3ae4be
 SHA512:
-  metadata.gz: b9085e03ef76738b5495d58473582da0ea2aa42efabcf49d48690104b12fdeb5b3f5f69758741aea25c4d9bec6ed6b103f8c1d3a4f766b7dac0de6fc1b3d2c7e
-  data.tar.gz: e7be1f72dfd63f2bd837b8cbe586a76e09e55241609f0db117579180e3080bb3b637daa712ce3aecbfd3b054f6fe1c111ff050faafbe698ecb3cffbb5fde930d
+  metadata.gz: a7ee12e83f1a3a567fcd692532bd47c2285defa6b7dc00f72ffd5c992e1d637625877a50d198e2412b337b126e24ea509730f1bd848fdd7fdf67cf5d8d75d8e1
+  data.tar.gz: 56bc28a766236be23ac16c98ee31493bbd024d5c9e41a2e07bb3866f9f7861bd288b3b759d1e2737d4e49292c8ab519baa03d63e806fe2463716cad51c06008c

data/bin/git-pr

@@ -301,7 +301,22 @@ when "open"
   remote = git.find_remote_for_local_branch source
   remote_url = remote ? remote.url : nil
   unless remote_url and remote_url.match /github\.com/
-    puts "Branch '#{source}' has never been pushed to GitHub."
+    puts <<EOS
+
+Branch '#{source}' has never been pushed to GitHub,
+or was pushed without setting the upstream branch.
+
+To fix this problem, try running:
+
+    git branch --set-upstream-to=<your_remote>/#{source} #{source}
+
+In the future, you can avoid this problem by making your first push
+with the --set-upstream argument(or the shorthand, -u):
+
+    git push --set-upstream <your_remote> #{source}
+    git push -u <your_remote> #{source}
+
+EOS
     exit -1
   end
   github_source_owner = remote_url.match(/git@github.com:(.*)\//)[1]

data/lib/git_pr/merge.rb

@@ -16,6 +16,13 @@ module GitPr
     [source_remote, target_remote]
   end
 
+  def self.are_branches_identical? git, branch_one, branch_two
+    sha1 = `git rev-parse --short #{branch_one}`.strip!
+    sha2 = `git rev-parse --short #{branch_two}`.strip!
+    return (sha1 == sha2) &&
+           git.diff(branch_one, branch_two).stats[:total][:files] == 0
+  end
+
   def self.merge_pull_cleanly git, pull, command_options
     unless command_options.yolo
       case pull.state
@@ -84,6 +91,15 @@ EOS
       target_remote.fetch
     end
 
+    current_branch = `git rev-parse --abbrev-ref HEAD`.strip!
+    at_exit do
+      # Restore the branch we started on, if it hasn't been deleted as part of
+      # completing a merge.
+      if git.branches[current_branch]
+        GitPr.run_command "git checkout -q #{current_branch}"
+      end
+    end
+
     # Get the target branch up to date
     puts "Update branch '#{target_branch}' from remote"
     GitPr.run_command "git checkout -q #{target_branch}"
@@ -94,7 +110,7 @@ EOS
     # If the local target branch differs from the remote target branch, they
     # must be reconciled manually.
     remote_target_branch = "#{target_remote}/#{target_branch}"
-    if git.diff("remotes/#{remote_target_branch}", target_branch).any?
+    unless GitPr.are_branches_identical? git, "remotes/#{remote_target_branch}", target_branch
       puts "Local branch '#{target_branch}' differs from remote branch '#{remote_target_branch}'. Please reconcile before continuing.".red
       exit -1
     end
@@ -104,7 +120,7 @@ EOS
     # manually.
     remote_source_branch = "#{source_remote}/#{source_branch}"
     if git.is_local_branch? source_branch and
-        git.diff("remotes/#{remote_source_branch}", source_branch).any?
+        not GitPr.are_branches_identical? git, "remotes/#{remote_source_branch}", source_branch
       puts "Local branch '#{source_branch}' differs from remote branch '#{remote_source_branch}'. Please reconcile before continuing.".red
       exit -1
     end
@@ -115,6 +131,7 @@ EOS
     puts "Create temporary branch '#{rebase_branch}'"
     if git.is_local_branch? rebase_branch
       puts "Local rebase branch '#{rebase_branch}' already exists. Please remove before continuing.".red
+      GitPr.run_command "git checkout -q #{current_branch}"
       exit -1
     end
     GitPr.run_command "git checkout -q -b #{rebase_branch} #{remote_source_branch}"

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.14.beta12"
+  VERSION = "0.0.14.beta15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.14.beta12
+  version: 0.0.14.beta15
 platform: ruby
 authors:
 - Brian Sharon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize