X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Fland1.sh;fp=lustre%2Fscripts%2Fland1.sh;h=c3a04684688df3bafd5b1bef2b459a7773dede70;hb=2dc9c16e770415d56839e1996015fec5fab93f29;hp=16f6b205793958b1a749451def7326399c1d008a;hpb=401deb5075f9ab7f6c8c1831c56a84b0134e923c;p=fs%2Flustre-release.git diff --git a/lustre/scripts/land1.sh b/lustre/scripts/land1.sh index 16f6b20..c3a0468 100755 --- 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