Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:winton/gitcycle

Conflicts:
	README.md
  • Loading branch information...
commit bf33c3a486b09afbd44851b19b2f00d3fab71481 2 parents 98e41a9 + e74532f
@winton authored
View
11 README.md
@@ -99,15 +99,8 @@ This will add a "pass" label to the issue and will complete the pull request by
Todo
----
-* Check for conflict whenever merge happens
-* Add conflict check when calling "qa pass [ticket]"
* Instead of detecting CONFLICT, use error status $? != 0
* Add comment on lighthouse with issue URL
* Label issues with ticket milestone?
-
-Details
--------
-
-### gitc + ticket URL
-
-*
+* Silent verbose branch output when recreating
+* gitc qa pass 1 2 3, should check if the branch exists locally
View
9 features/gitcycle.feature
@@ -34,7 +34,8 @@ Scenario: Feature branch w/ custom branch name
Adding remote repo 'config.owner/config.repo'.
Fetching remote repo 'config.owner/config.repo'.
Checking out remote branch 'ticket.id-rename' from 'config.owner/config.repo/master'.
- Pushing 'ticket.id-rename'.
+ Pulling 'origin/ticket.id-rename'.
+ Pushing 'origin/ticket.id-rename'.
Sending branch information to gitcycle.
"""
And redis entries valid
@@ -55,7 +56,8 @@ Scenario: Feature branch
Adding remote repo 'config.owner/config.repo'.
Fetching remote repo 'config.owner/config.repo'.
Checking out remote branch 'ticket.id' from 'config.owner/config.repo/master'.
- Pushing 'ticket.id'.
+ Pulling 'origin/ticket.id'.
+ Pushing 'origin/ticket.id'.
Sending branch information to gitcycle.
"""
And redis entries valid
@@ -178,7 +180,8 @@ Scenario: QA issue
Adding remote repo 'config.owner/config.repo'.
Fetching remote repo 'config.owner/config.repo'.
Checking out remote branch 'qa_master' from 'config.owner/config.repo/master'.
- Pushing 'qa_master'.
+ Pulling 'origin/qa_master'.
+ Pushing 'origin/qa_master'.
Adding remote repo 'config.user/config.repo'.
Fetching remote repo 'config.user/config.repo'.
Merging remote branch 'ticket.id' from 'config.user/config.repo'.
View
2  gitcycle.gemspec
@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
Gem::Specification.new do |s|
s.name = "gitcycle"
- s.version = '0.1.11'
+ s.version = '0.1.12'
s.platform = Gem::Platform::RUBY
s.authors = [ 'Winton Welsh' ]
s.email = [ 'mail@wintoni.us' ]
View
9 lib/gitcycle.rb
@@ -86,7 +86,7 @@ def create_branch(url_or_title)
run("git checkout #{name}")
else
puts "Tracking branch '#{name}'.\n".green
- run("git fetch && git checkout -b #{name} origin/#{name}")
+ run("git fetch && git checkout --track -b #{name} origin/#{name}")
end
else
puts "Sending branch information to gitcycle.".green
@@ -389,9 +389,12 @@ def checkout_remote_branch(options={})
add_remote_and_fetch(options)
puts "Checking out remote branch '#{target}' from '#{owner}/#{repo}/#{branch}'.\n".green
- run("git checkout -b #{target} #{owner}/#{branch}")
+ run("git checkout --track -b #{target} #{owner}/#{branch}")
- puts "Pushing '#{target}'.\n".green
+ puts "Pulling 'origin/#{target}'.\n".green
+ run("git pull origin #{target}")
+
+ puts "Pushing 'origin/#{target}'.\n".green
run("git push origin #{target}")
end
Please sign in to comment.
Something went wrong with that request. Please try again.