@@ -283,7 +283,7 @@ desc "Set up _deploy folder and deploy branch for Github Pages deployment"

 task :setup_github_pages do

   repo_url = get_stdin("Enter the read/write url for your repository: ")

   user = repo_url.match(/:([^\/]+)/)[1]

-  branch = (repo_url.match(/\/\w+.github.com/).nil?) ? 'gh-pages' : 'master'

+  branch = (repo_url.match(/\/[\w-]+.github.com/).nil?) ? 'gh-pages' : 'master'

   project = (branch == 'gh-pages') ? repo_url.match(/\/([^\.]+)/)[1] : ''

   unless `git remote -v`.match(/origin.+?octopress.git/).nil?

     # If octopress is still the origin remote (from cloning) rename it to octopress