X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fmerge2.sh;h=0ef27cc45ac04dbd68395c7bb6df3b057e252f76;hb=8bb5c9cfe29de7db0d46c817f1352f5dc8ff3cfa;hp=43586f062e7e351c93eb8c16e0e249fae45f07e9;hpb=c9bd81d352c0e43db47d4846b97ee1ddd9565839;p=fs%2Flustre-release.git

diff --git a/build/merge2.sh b/build/merge2.sh
index 43586f0..0ef27cc 100755
--- 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