From: jacob <jacob>
Date: Fri, 6 May 2005 13:20:57 +0000 (+0000)
Subject: fix missing 'test'
X-Git-Tag: 1.4.10~1196
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=d93b25ccbf92adc01975453e40f0bbe9d4d96ffc;p=fs%2Flustre-release.git

fix missing 'test'
---

diff --git a/build/branch.sh b/build/branch.sh
index 023a3f1..b64681f 100755
--- a/build/branch.sh
+++ b/build/branch.sh
@@ -31,7 +31,7 @@ case $child in
   *) child="b_$child"
 esac
 
-if test "$parent" != "HEAD" && test -f $dir/CVS/Tag && "`cat $dir/CVS/Tag`" != "T$parent"; then
+if test "$parent" != "HEAD" -a -f $dir/CVS/Tag -a "`cat $dir/CVS/Tag`" != "T$parent"; then
 	echo "This script must be run within the $parent branch"
 	exit 1
 fi