gitcycle 0.2.9 → 0.2.10

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.9'
+  s.version     = '0.2.10'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -243,12 +243,22 @@ class Gitcycle
         :branch => branch['name']
       )
     elsif branch
-      # Merge from upstream owner
+      # Merge from upstream source branch
       merge_remote_branch(
         :owner => branch['repo']['owner'],
         :repo => branch['repo']['name'],
         :branch => branch['source']
       )
+    else
+      puts "\nRetrieving repo information from gitcycle.\n".green
+      repo = get('repo')
+
+      # Merge from upstream branch with same name
+      merge_remote_branch(
+        :owner => repo['owner'],
+        :repo => repo['name'],
+        :branch => current_branch
+      )
     end
 
     unless collab
@@ -733,10 +743,12 @@ class Gitcycle
 
     add_remote_and_fetch(options)
 
-    puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
-    run("git merge #{owner}/#{branch}")
+    if branches(:remote => true, :match => "#{owner}/#{branch}")
+      puts "\nMerging remote branch '#{branch}' from '#{owner}/#{repo}'.\n".green
+      run("git merge #{owner}/#{branch}")
 
-    fix_conflict(options)
+      fix_conflict(options)
+    end
   end
 
   def options?(args)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitcycle
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Winton Welsh