landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / scripts / land1.sh

diff --git a/lustre/scripts/land1.sh b/lustre/scripts/land1.sh
index 16f6b20..c3a0468 100755 (executable)
--- a/lustre/scripts/land1.sh
+++ b/lustre/scripts/land1.sh
@@ -36,7 +36,7 @@ case $child in
   *) child="b_$child"
 esac
 
-if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
+if [ "$parent" != "HEAD" -a "`cat CVS/Tag 2> /dev/null`" != "T$parent" ]; then
         echo "This script must be run within the $parent branch"
        exit 1
 fi