X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/9f943527a41af4e68dd05ef208ba05666a37e2da..6dd74c1a57e084da1ec38bac52b48bda43d31334:/vcsh?ds=sidebyside diff --git a/vcsh b/vcsh index 301151a..53ce905 100755 --- a/vcsh +++ b/vcsh @@ -24,6 +24,7 @@ SELF=$(basename $0) fatal() { echo "$SELF: fatal: $1" >&2 + [ -z $2] && exit 1 exit $2 } @@ -149,9 +150,10 @@ clone() { git remote add origin "$GIT_REMOTE" git config branch.master.remote origin git config branch.master.merge refs/heads/master - if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then - info "remote is empty, not merging anything" - exit + VCSH_CLONE_ERROR=$(git ls-remote origin master 2>&1) + if [ -n "$VCSH_CLONE_ERROR" ]; then + rm -rf "$GIT_DIR" + fatal "$VCSH_CLONE_ERROR" 1 fi git fetch hook pre-merge