Permalink
Browse files

Merge branch 'hotfix-1.0.1.3'

  • Loading branch information...
2 parents 29231e0 + 63ddc9b commit d75ad827ce8c16ae4c296ed5e159f5d01100865e @jeffWelling jeffWelling committed Mar 3, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/ticgit-ng/base.rb
  2. +1 −1 lib/ticgit-ng/version.rb
View
2 lib/ticgit-ng/base.rb
@@ -284,7 +284,7 @@ def sync_tickets(repo='origin', push=true, verbose=true )
remote_branches=@git.branches.remote.map{|b|
b.full.gsub('remotes/', '')[Regexp.new("^#{Regexp.escape(repo)}/.*")]
}.compact
- remote_branches.include?('ticgit-ng') ? r_ticgit='ticgit-ng' : r_ticgit='ticgit'
+ remote_branches.include?("#{repo}/ticgit-ng") ? r_ticgit='ticgit-ng' : r_ticgit='ticgit'
in_branch(false) do
repo_g=git.remote(repo)
git.pull(repo_g, repo+'/'+r_ticgit)
View
2 lib/ticgit-ng/version.rb
@@ -1,3 +1,3 @@
module TicGitNG
- VERSION = '1.0.1.2'
+ VERSION = '1.0.1.3'
end

0 comments on commit d75ad82

Please sign in to comment.