From 2ec69b96147433253f33a88857c7f03804beee04 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 25 Jul 2017 00:47:00 +0100
Subject: [PATCH] Use different branches

---
 publish.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/publish.sh b/publish.sh
index 9abccf3b..c0cbd735 100755
--- a/publish.sh
+++ b/publish.sh
@@ -6,27 +6,24 @@ SITE_ENV="prod"
 REPO=`git config remote.origin.url`
 SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:}
 SHA=`git rev-parse --verify HEAD`
+SOURCE_BRANCH="source"
 TARGET_BRANCH="master"
 
 # Build front-end assets.
 npm run prod
 
+git config --local user.email "oliver@oliver@oliverdavies.uk"
+
 # Remove the existing docs directory, build the site and create the new
 # docs directory.
 rm -rf ./docs
 vendor/bin/sculpin generate --no-interaction --clean --env=${SITE_ENV}
 touch output_${SITE_ENV}/.nojekyll
-mv output_${SITE_ENV} docs
-
-git config --local user.email "oliver@oliver@oliverdavies.uk"
-
-if [ -z `git diff --exit-code` ]; then
-    echo "No changes on this push. Exiting."
-    exit 0
-fi
 
 # Add, commit and push the changes.
-git checkout $TARGET_BRANCH
-git add --all docs
+cd output_${SITE_ENV}
+mv ../.git .
+git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH
+git add --all .
 git commit -m "Re-generate site. $SHA"
 git push $SSH_REPO $TARGET_BRANCH