gitcycle 0.2.28 → 0.2.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/gitcycle.gemspec +1 -1
  2. data/lib/gitcycle.rb +5 -5
  3. metadata +1 -1
data/gitcycle.gemspec CHANGED
@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "gitcycle"
9
- s.version = '0.2.28'
9
+ s.version = '0.2.29'
10
10
  s.platform = Gem::Platform::RUBY
11
11
  s.authors = [ 'Winton Welsh' ]
12
12
  s.email = [ 'mail@wintoni.us' ]
data/lib/gitcycle.rb CHANGED
@@ -271,14 +271,14 @@ class Gitcycle
271
271
  if branch && branch['collab']
272
272
  # Merge from collab
273
273
  merge_remote_branch(
274
- :owner => branch['home'],
274
+ :owner => owner = branch['home'],
275
275
  :repo => branch['repo']['name'],
276
276
  :branch => branch['source']
277
277
  )
278
278
  elsif branch
279
279
  # Merge from upstream source branch
280
280
  merge_remote_branch(
281
- :owner => branch['repo']['owner'],
281
+ :owner => owner = branch['repo']['owner'],
282
282
  :repo => branch['repo']['name'],
283
283
  :branch => branch['source']
284
284
  )
@@ -288,13 +288,13 @@ class Gitcycle
288
288
 
289
289
  # Merge from upstream branch with same name
290
290
  merge_remote_branch(
291
- :owner => repo['owner'],
291
+ :owner => owner = repo['owner'],
292
292
  :repo => repo['name'],
293
293
  :branch => current_branch
294
294
  )
295
295
  end
296
296
 
297
- unless branch && branch['collab']
297
+ unless branch && branch['collab'] || owner == @git_login
298
298
  # Merge from origin
299
299
  merge_remote_branch(
300
300
  :owner => @git_login,
@@ -313,7 +313,7 @@ class Gitcycle
313
313
 
314
314
  branch = pull
315
315
 
316
- if branch['collab']
316
+ if branch && branch['collab']
317
317
  puts "\nPushing branch '#{branch['home']}/#{branch['name']}'.\n".green
318
318
  run("git push #{branch['home']} #{branch['name']} -q")
319
319
  elsif branch
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitcycle
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.28
4
+ version: 0.2.29
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: