Skip to content

Commit

Permalink
Merge branch 'hotfix-1.0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffWelling committed Mar 3, 2011
2 parents a5ccaa2 + ffc8b57 commit 9b63ffa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/ticgit-ng/base.rb
Expand Up @@ -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?('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)
Expand Down

0 comments on commit 9b63ffa

Please sign in to comment.