Merge branch 'develop' of github.com:starkandwayne/bucc into HEAD

egen · Nov 2, 2017 · 3e8100e · 3e8100e
2 parents e1297ce + 6ce1f14
commit 3e8100e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ci/tasks/get-latest-bosh-deployment/task b/ci/tasks/get-latest-bosh-deployment/task
@@ -3,6 +3,8 @@
 set -e
 set -o pipefail
 
+ref=$(cat bosh-deployment/.git/ref | cut -c1-8)
+
 pushd bucc > /dev/null
 
 if [[ -z $(git config --global user.email) ]]; then
@@ -15,10 +17,12 @@ fi
 echo "CHECKING git status"
 git status
 
-echo "MERGE bosh-deployment repo with git subtree"
-git subtree pull --prefix src/bosh-deployment \
-    ../bosh-deployment master --squash \
-    -m "merging the latest bosh-deployment repo"
+echo "MERGE bosh-deployment repo"
+rm -r src/bosh-deployment
+cp -r ../bosh-deployment src/
+rm -rf src/bosh-deployment/{ci,tests}
+git add src/bosh-deployment
+git commit -m "Update to cloudfoundry/bosh-deployment@$ref"
 
 popd > /dev/null