From 93d14c283f5fd3b8b2c355f44358a8c76d0877bf Mon Sep 17 00:00:00 2001
From: jacobawenger <jacob@firebase.com>
Date: Wed, 2 Jul 2014 17:43:47 -0700
Subject: [PATCH] Updated release script's git commands and typo in test file

---
 release.sh                         | 29 +++++++++++++++++++++++------
 tests/specs/ReactFireMixin.spec.js |  1 -
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/release.sh b/release.sh
index af5237d..f1d362d 100755
--- a/release.sh
+++ b/release.sh
@@ -94,14 +94,31 @@ cp CHANGELOG.md $STANDALONE_DEST/changelog.txt
 echo "*** ReactFire changelog copied to firebase-clients ***"
 echo
 
-# Push the new files to the firebase-clients repo
+# Go to the firebase-clients repo
 cd ${STANDALONE_DEST}/
-git pull
-git add .
-git commit -am "[firebase-release] Updated ReactFire to $VERSION"
-git push
+
+# Make sure the checked-out firebase-clients branch is master
+FIREBASE_CLIENTS_BRANCH="$(git branch | grep "*" | awk -F ' ' '{print $2}')"
+if [[ $FIREBASE_CLIENTS_BRANCH != "master" ]]; then
+  echo "Error: Your firebase-clients repo is not on the master branch. You will need to push the new files to it manually."
+  exit 1
+fi
+
+# Pull any changes to the firebase-clients repo
+git pull origin master
 if [[ $? -ne 0 ]]; then
-  echo "Error pushing firebase-clients."
+  echo "Error pulling firebase-clients repo."
+  exit 1
+fi
+
+# Commit to the firebase-clients repo
+git add .
+git commit -am "[firebase-release] Updated Firebase $DESCRIPTION to $VERSION"
+
+# Push the new files to the firebase-clients repo
+git push origin master
+if [[ $? -ne 0 ]]; then
+  echo "Error pushing firebase-clients repo."
   exit 1
 fi
 echo
diff --git a/tests/specs/ReactFireMixin.spec.js b/tests/specs/ReactFireMixin.spec.js
index 9f0aef2..e0286c2 100644
--- a/tests/specs/ReactFireMixin.spec.js
+++ b/tests/specs/ReactFireMixin.spec.js
@@ -1,5 +1,4 @@
 describe("ReactFireMixin Tests:", function() {
-  // Reset the Firebase before each test
   beforeEach(function(done) {
     beforeEachHelper(done);
   });