Makefile: Make `make test` silent

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 3cea66646dc3ec60a87881b03ca1d94c4a9605cb..39240093afd50dd0a47b528abb2249fedf9e1d27 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -24,7 +24,7 @@ basename() {
 }
 
 SELF=$(basename $0)
-VERSION='1.20130909'
+VERSION='1.20130909.git-HEAD'
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
@@ -159,11 +159,11 @@ clone() {
        for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
                [ -e "$object" ] &&
                        error "'$object' exists." &&
-                       VCSH_CONFLICT=1;
+                       VCSH_CONFLICT=1
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                fatal "will stop after fetching and not try to merge!
-  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
+  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
        git merge origin/master
        hook post-clone
        retire