Update post-receive hook to avoid unwanted merge

README.md

@@ -19,10 +19,16 @@ do
         # only checking out the master (or whatever branch you would like to deploy)
         if [ "$ref" = "refs/heads/master" ];
         then
-                echo "Ref $ref received. Deploying master branch to production..."
                 cd $TARGET
                 unset GIT_DIR
-                git pull --ff-only $REMOTE master
+                PROD_BR=`git rev-parse --abbrev-ref HEAD`
+                if [ $PROD_BR != "master" ];
+                then
+                        echo "Production repo is on $PROD_BR branch. Aborting..."
+                else
+                        echo "Ref $ref (${newrev:0:7}) received. Deploying master branch to production..."
+                        git pull --ff-only $REMOTE master
+                fi
         else
                 echo "Ref $ref received. Doing nothing: only the master branch may be deployed on this server."
         fi