- landing of b_hd_cleanup_merge to HEAD.

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

diff --git a/lustre/scripts/land1.sh b/lustre/scripts/land1.sh
index 08f559a..98fd721 100755 (executable)
--- a/lustre/scripts/land1.sh
+++ b/lustre/scripts/land1.sh
@@ -45,7 +45,7 @@ TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
 check_tag() {
        [ -z "$1" ] && echo "check_tag() missing arg" && exit3
        [ "$1" = "HEAD" ] && return
-       $CVS log $TEST_FILE | grep -q " $1: " && return
+       $CVS log $TEST_FILE 2> /dev/null | grep -q "    $1: " && return
        echo "$0: tag $1 not found in $TEST_FILE"
        exit 2
 }
@@ -107,4 +107,4 @@ else
 fi
 echo "done"
 
-echo "Test, commit and then run land2.sh (no arguments)"
+echo "Build, test, commit and then run land2.sh (no arguments)"