Userspace o2iblnd development branch

[fs/lustre-release.git] / build / merge2.sh

diff --git a/build/merge2.sh b/build/merge2.sh
index 43586f0..0ef27cc 100755 (executable)
--- a/build/merge2.sh
+++ b/build/merge2.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 
 if [ ! -f .mergeinfo ] ; then
     echo ".mergeinfo doesn't exist - exit"
@@ -7,6 +7,12 @@ fi
 
 . .mergeinfo
 
+if [ "$OPERATION" != "Merge" ] ; then
+    echo "OPERATION must be Merge - is $OPERATION"
+    echo "You should probably be running ${OPERATION}2.sh"
+    exit
+fi
+
 if [ -f $CONFLICTS ] ; then
     echo "$CONFLICTS exists - clean up first"
     cat $CONFLICTS