Permalink
Browse files

Fixing branch match regex and version bump (0.1.7)

  • Loading branch information...
1 parent 71543d8 commit 40103ca59dd72797b60fcc118645490c4d67bada @winton committed Jan 19, 2012
Showing with 7 additions and 7 deletions.
  1. +1 −1 gitcycle.gemspec
  2. +6 −6 lib/gitcycle.rb
View
@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
Gem::Specification.new do |s|
s.name = "gitcycle"
- s.version = '0.1.6'
+ s.version = '0.1.7'
s.platform = Gem::Platform::RUBY
s.authors = [ 'Winton Welsh' ]
s.email = [ 'mail@wintoni.us' ]
View
@@ -61,13 +61,13 @@ def create_branch(url_or_title)
branch['home'] = @git_login
branch['source'] = branches(:current => true)
- unless yes?("Would you like to eventually merge this feature into #{branch['source']}?")
- branch['source'] = q("What branch would you like to eventually merge this feature into?")
- end
+ # unless yes?("Would you like to eventually merge this feature into #{branch['source']}?")
+ # branch['source'] = q("What branch would you like to eventually merge this feature into?")
+ # end
- unless branches(:match => branch['source'])
+ # unless branches(:match => branch['source'])
- end
+ # end
unless yes?("Would you like to name your branch '#{name}'?")
name = q("\nWhat would you like to name your branch?")
@@ -334,7 +334,7 @@ def branches(options={})
if options[:current]
b.match(/\*\s+(.+)/)[1]
elsif options[:match]
- b.match(/([\s]+|origin\/)(#{options[:match]})/)[2] rescue nil
+ b.match(/([\s]+|origin\/)(#{options[:match]})$/)[2] rescue nil
else
b
end

0 comments on commit 40103ca

Please sign in to comment.