From 6d33dc5070db0f20d205e8ffcc4158741986f2a7 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 6 May 2015 19:41:36 +1000
Subject: [PATCH] Add script to merge master into the current branch if
 required before running specs

---
 script/ci/includes.sh                 |  7 +++++++
 script/ci/merge_master_into_branch.sh | 12 ++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100755 script/ci/merge_master_into_branch.sh

diff --git a/script/ci/includes.sh b/script/ci/includes.sh
index ee59a732d7..d7619f7d23 100644
--- a/script/ci/includes.sh
+++ b/script/ci/includes.sh
@@ -12,6 +12,13 @@ function exit_unless_master_merged {
     fi
 }
 
+function succeed_if_master_merged {
+    if [[ `git branch -a --merged origin/$BUILDKITE_BRANCH` == *origin/master* ]]; then
+	echo "This branch already has the current master merged."
+	exit 0
+    fi
+}
+
 function drop_and_recreate_database {
     # Adapted from: http://stackoverflow.com/questions/12924466/capistrano-with-postgresql-error-database-is-being-accessed-by-other-users
     psql -U openfoodweb postgres <<EOF
diff --git a/script/ci/merge_master_into_branch.sh b/script/ci/merge_master_into_branch.sh
new file mode 100755
index 0000000000..ebbafd865c
--- /dev/null
+++ b/script/ci/merge_master_into_branch.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+source ./script/ci/includes.sh
+
+succeed_if_master_merged
+
+git checkout $BUILDKITE_BRANCH
+git merge origin/$BUILDKITE_BRANCH
+git merge origin/master -m "Auto-merge from CI [skip ci]"
+git push origin $BUILDKITE_BRANCH
+git checkout origin/$BUILDKITE_BRANCH