X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fscripts%2Fland1.sh;h=16f6b205793958b1a749451def7326399c1d008a;hp=0c0780339416a5b5f691f914a52d35e52d2cc086;hb=ff17cc7e0282d9b1522810e0c5d12171c4d46a2d;hpb=93d22db85666a137dae01035742ce47dcc67c442

diff --git a/lustre/scripts/land1.sh b/lustre/scripts/land1.sh
index 0c07803..16f6b20 100755
--- a/lustre/scripts/land1.sh
+++ b/lustre/scripts/land1.sh
@@ -25,6 +25,17 @@ CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
 date=`date +%Y%m%d_%H%M`
 module=lustre
 
+case $parent in
+  HEAD) : ;;
+  b_*|b1*) : ;;
+  *) parent="b_$parent" ;;
+esac
+case $child in
+  HEAD) : ;;
+  b_*|b1*) : ;;
+  *) child="b_$child"
+esac
+
 if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
         echo "This script must be run within the $parent branch"
 	exit 1
@@ -32,13 +43,6 @@ fi
 
 dir=$3
 
-if [ $parent != "HEAD" ]; then
-  parent="b_$parent"
-fi
-if [ $child != "HEAD" ]; then
-  child="b_$child"
-fi
-
 cat << EOF > .mergeinfo
 parent=$parent
 PARENT=$PARENT
@@ -90,4 +94,3 @@ fi
 echo "done"
 
 echo "Test, commit and then run land2.sh (no arguments)"
-