Permalink
Browse files

Revert "Version bum (0.2.28)"

This reverts commit aa8c2ec.

Conflicts:

	gitcycle.gemspec
  • Loading branch information...
1 parent 8ac3373 commit a4e8b45ddf426fd0102f8db07a981e3b88c9ac3e @winton committed Oct 21, 2012
Showing with 1 addition and 20 deletions.
  1. +1 −20 lib/gitcycle.rb
View
@@ -364,7 +364,6 @@ def qa(*issues)
elsif branch =~ /^qa_/
puts "\nRetrieving branch information from gitcycle.\n".green
qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
- qa_branch_name = "qa_#{qa_branch['source']}_#{qa_branch['user']}"
if pass_fail == 'pass'
checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
@@ -380,28 +379,10 @@ def qa(*issues)
if pass_fail == 'pass' && issues.empty?
owner, repo = qa_branch['repo'].split(':')
-
- qa_branch['branches'].each do |b|
- repo = b['repo'].split(':')[1]
-
- add_remote_and_fetch(
- :owner => b['home'],
- :repo => repo
- )
-
- output = run("git log #{qa_branch_name}..#{b['home']}/#{repo}")
-
- unless output.strip.empty?
- puts "\nUn-merged changes detected in '#{repo}/#{b['home']}':".red
- puts "\n#{output}"
- puts "\nTo merge the change: git merge #{repo}/#{b['home']}".yellow
- end
- end
-
merge_remote_branch(
:owner => owner,
:repo => repo,
- :branch => qa_branch_name,
+ :branch => "qa_#{qa_branch['source']}_#{qa_branch['user']}",
:type => :from_qa
)
end

0 comments on commit a4e8b45

Please sign in to comment.