hub 1.8.2 → 1.8.3

data/lib/hub/commands.rb

@@ -108,7 +108,11 @@ module Hub
       options[:base] ||= master_branch.short_name
 
       if tracked_branch = options[:head].nil? && current_branch.upstream
-        if base_project == head_project and tracked_branch.short_name == options[:base]
+        if !tracked_branch.remote?
+          # The current branch is tracking another local branch. Pretend there is
+          # no upstream configuration at all.
+          tracked_branch = nil
+        elsif base_project == head_project and tracked_branch.short_name == options[:base]
           $stderr.puts "Aborted: head branch is the same as base (#{options[:base].inspect})"
           warn "(use `-h <branch>` to specify an explicit pull request head)"
           abort
@@ -537,9 +541,11 @@ module Hub
           # $ hub browse pjhyett/github-services
           # $ hub browse github-services
           project = github_project dest
+          branch = master_branch
         else
           # $ hub browse
           project = current_project
+          branch = current_branch && current_branch.upstream || master_branch
         end
 
         abort "Usage: hub browse [<USER>/]<REPOSITORY>" unless project
@@ -547,10 +553,8 @@ module Hub
         # $ hub browse -- wiki
         path = case subpage = args.shift
         when 'commits'
-          branch = (!dest && current_branch.upstream) || master_branch
           "/commits/#{branch.short_name}"
         when 'tree', NilClass
-          branch = !dest && current_branch.upstream
           "/tree/#{branch.short_name}" if branch and !branch.master?
         else
           "/#{subpage}"

data/lib/hub/context.rb

@@ -130,7 +130,7 @@ module Hub
       end
 
       def upstream_project
-        if upstream = current_branch.upstream
+        if branch = current_branch and upstream = branch.upstream and upstream.remote?
           remote = remote_by_name upstream.remote_name
           remote.project
         end

data/lib/hub/version.rb

@@ -1,3 +1,3 @@
 module Hub
-  Version = VERSION = '1.8.2'
+  Version = VERSION = '1.8.3'
 end

data/man/hub.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HUB" "1" "January 2012" "DEFUNKT" "Git Manual"
+.TH "HUB" "1" "March 2012" "DEFUNKT" "Git Manual"
 .
 .SH "NAME"
 \fBhub\fR \- git + hub = github
@@ -349,7 +349,7 @@ $ git pull\-request \-i 123
 
 # $ git checkout https://github\.com/defunkt/hub/pull/73
 # > git remote add \-f \-t feature git://github:com/mislav/hub\.git
-# > git checkout \-b mislav\-feature mislav/feature
+# > git checkout \-\-track \-B mislav\-feature mislav/feature
 
 # $ git checkout https://github\.com/defunkt/hub/pull/73 custom\-branch\-name
 .

data/man/hub.1.html

@@ -335,7 +335,7 @@ $ git pull-request -i 123
 
 <pre><code># $ git checkout https://github.com/defunkt/hub/pull/73
 # &gt; git remote add -f -t feature git://github:com/mislav/hub.git
-# &gt; git checkout -b mislav-feature mislav/feature
+# &gt; git checkout --track -B mislav-feature mislav/feature
 
 # $ git checkout https://github.com/defunkt/hub/pull/73 custom-branch-name
 </code></pre>
@@ -449,7 +449,7 @@ $ git help hub
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>DEFUNKT</li>
-    <li class='tc'>January 2012</li>
+    <li class='tc'>March 2012</li>
     <li class='tr'>hub(1)</li>
   </ol>
 

data/test/hub_test.rb

@@ -839,7 +839,6 @@ class HubTest < Test::Unit::TestCase
   def test_pullrequest_from_tracking_branch
     stub_branch('refs/heads/feature')
     stub_tracking('feature', 'mislav', 'yay-feature')
-    stub_command_output "rev-list --cherry-pick --right-only --no-merges mislav/master...", nil
 
     stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
       with(:body => { 'pull' => {'base' => "master", 'head' => "mislav:yay-feature", 'title' => "hereyougo"} }).
@@ -849,6 +848,18 @@ class HubTest < Test::Unit::TestCase
     assert_output expected, "pull-request hereyougo -f"
   end
 
+  def test_pullrequest_from_branch_tracking_local
+    stub_branch('refs/heads/feature')
+    stub_tracking('feature', 'refs/heads/master')
+
+    stub_request(:post, "https://#{auth}github.com/api/v2/json/pulls/defunkt/hub").
+      with(:body => { 'pull' => {'base' => "master", 'head' => "tpw:feature", 'title' => "hereyougo"} }).
+      to_return(:body => mock_pullreq_response(1))
+
+    expected = "https://github.com/defunkt/hub/pull/1\n"
+    assert_output expected, "pull-request hereyougo -f"
+  end
+
   def test_pullrequest_enterprise_no_tracking
     stub_hub_host('git.my.org')
     stub_repo_url('git@git.my.org:defunkt/hub.git')
@@ -1156,6 +1167,11 @@ config
       'open https://github.com/mislav/hub/tree/feature/bar'
   end
 
+  def test_hub_browse_no_branch
+    stub_branch(nil)
+    assert_command 'browse', 'open https://github.com/defunkt/hub'
+  end
+
   def test_hub_browse_current
     assert_command "browse", "open https://github.com/defunkt/hub"
     assert_command "browse --", "open https://github.com/defunkt/hub"
@@ -1282,13 +1298,13 @@ config
       stub_command_output 'symbolic-ref -q HEAD', value
     end
 
-    def stub_tracking(from, remote_name, remote_branch)
+    def stub_tracking(from, upstream, remote_branch = nil)
       stub_command_output "rev-parse --symbolic-full-name #{from}@{upstream}",
-        remote_branch ? "refs/remotes/#{remote_name}/#{remote_branch}" : nil
+        remote_branch ? "refs/remotes/#{upstream}/#{remote_branch}" : upstream
     end
 
     def stub_tracking_nothing(from = 'master')
-      stub_tracking(from, nil, nil)
+      stub_tracking(from, nil)
     end
 
     def stub_remotes_group(name, value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hub
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies: []
 description: ! "  `hub` is a command line utility which adds GitHub knowledge to `git`.\n\n
   \ It can used on its own or as a `git` wrapper.\n\n  Normal:\n\n      $ hub clone