From 35ebe0d647dd1775a99ba476f5f26958003c951e Mon Sep 17 00:00:00 2001 From: Frederic Hemberger Date: Tue, 11 Oct 2011 14:20:52 +0200 Subject: Allows '-' in deployment branch names, fixes #213 --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Rakefile') diff --git a/Rakefile b/Rakefile index c1594c7b..1206787e 100644 --- a/Rakefile +++ b/Rakefile @@ -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 -- cgit v1.2.1