c2ba320f1359455d3f8748d0a6c09cbabaf17dd7 galt Wed Jun 30 19:10:45 2010 -0700 more bugfixes for gilt diff --git src/utils/gitTools/gilt src/utils/gitTools/gilt index d3f30b1..f545871 100755 --- src/utils/gitTools/gilt +++ src/utils/gitTools/gilt @@ -30,12 +30,12 @@ echo "On $onbranch branch." -if [ "$mymaster" > 0 ] && [ "$omaster" > 0 ]; then +if [ "$mymaster" -gt "0" ] && [ "$omaster" -gt "0" ]; then echo "Your branch and 'origin/master' have diverged," echo "and have $mymaster and $omaster different commit(s) each, respectively." -elif (["$mymaster" == 0] && ["$omaster" > 0]); then +elif [ "$mymaster" -eq "0" ] && [ "$omaster" -gt "0" ]; then echo "Your branch is behind 'origin/master' by $omaster commits, and can be fast-forwarded." -elif (["$mymaster" > 0] && ["$omaster" == 0]); then +elif [ "$mymaster" -gt "0" ] && [ "$omaster" -eq "0" ]; then echo "Your branch is ahead of 'origin/master' by $mymaster commits." fi