From c1cb0025c16e1ec0dc9c4a10e41e502b2d86c2c9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 25 Aug 2015 12:37:15 +0100
Subject: [PATCH] Use subdirectory for gh pages docs

---
 docs/src/main/asciidoc/ghpages.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh
index a108383f..00a208de 100755
--- a/docs/src/main/asciidoc/ghpages.sh
+++ b/docs/src/main/asciidoc/ghpages.sh
@@ -15,6 +15,8 @@ fi
 # Find name of current branch
 ###################################################################
 branch=`git rev-parse --abbrev-ref HEAD`
+target=.
+if [ "$branch" != "master" ]; then target=./$branch; mkdir -p $target; fi
 
 # Stash any outstanding changes
 ###################################################################
@@ -30,8 +32,8 @@ for f in docs/target/generated-docs/*; do
     file=${f#docs/target/generated-docs/*}
     if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
         # Not ignored...
-        cp -rf $f .
-        git add -A $file
+        cp -rf $f $target
+        git add -A $target/$file
     fi
 done