From 62e6d4429f0d60dc2c2659b3d707c5f70c6c4fb5 Mon Sep 17 00:00:00 2001
From: Konstantin Gribov <grossws@gmail.com>
Date: Thu, 27 Sep 2012 02:11:13 +0400
Subject: [PATCH] Added support for non-default (gh-pages) branch on github

---
 lib/middleman-deploy/commands.rb  | 10 +++++++---
 lib/middleman-deploy/extension.rb |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/middleman-deploy/commands.rb b/lib/middleman-deploy/commands.rb
index c3e62d9..402a4c7 100644
--- a/lib/middleman-deploy/commands.rb
+++ b/lib/middleman-deploy/commands.rb
@@ -51,6 +51,8 @@ end
 # To push to a remote gh-pages branch on GitHub:
 activate :deploy do |deploy|
   deploy.method = :git
+  # git branch to push (default is gh-pages)
+  deploy.branch = "master"
 end
 EOF
       end
@@ -99,11 +101,13 @@ EOF
       end
 
       def deploy_git
+        branch = self.deploy_options.branch
+
         puts "## Deploying to GitHub Pages"
         Dir.mktmpdir do |tmp|
           # clone ./ with branch gh-pages to tmp
           repo = Git.clone(ENV['MM_ROOT'], tmp)
-          repo.checkout('origin/gh-pages', :new_branch => 'gh-pages')
+          repo.checkout("origin/#{branch}", :new_branch => branch)
 
           # copy ./build/* to tmp
           FileUtils.cp_r(Dir.glob(File.join(ENV['MM_ROOT'], 'build', '*')), tmp)
@@ -113,12 +117,12 @@ EOF
           repo.commit("Automated commit at #{Time.now.utc}")
 
           # push from tmp to self
-          repo.push('origin', 'gh-pages')
+          repo.push('origin', branch)
 
           # push to github
           github_url = Git.open(ENV['MM_ROOT']).remote.url
           repo.add_remote('github', github_url)
-          repo.push('github', 'gh-pages')
+          repo.push('github', branch)
         end
       end
 
diff --git a/lib/middleman-deploy/extension.rb b/lib/middleman-deploy/extension.rb
index 10a86a8..c0dd23e 100644
--- a/lib/middleman-deploy/extension.rb
+++ b/lib/middleman-deploy/extension.rb
@@ -5,7 +5,7 @@ require "middleman-core"
 module Middleman
   module Deploy
 
-    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :path, :clean); end
+    class Options < Struct.new(:whatisthis, :method, :host, :port, :user, :path, :clean, :branch); end
 
     class << self
 
@@ -19,6 +19,7 @@ module Middleman
 
         options.port ||= 22
         options.clean ||= false
+		options.branch ||= "gh-pages"
 
         @@options = options