vcsh: Fail fast if the clone branch is not valid

Also fixed the last hardcoded reference to the master branch.

diff --git a/vcsh b/vcsh
index 76502f530f1817d1b64ebd0a73d3f1253fc07905..200cab2bb18e85857612a00e17f86b887ae14c57 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -147,16 +147,16 @@ clone() {
        hook pre-clone
        init
        git remote add origin "$GIT_REMOTE"
        hook pre-clone
        init
        git remote add origin "$GIT_REMOTE"

+       git checkout -b "$VCSH_BRANCH" || return $?

        git config branch."$VCSH_BRANCH".remote origin
        git config branch."$VCSH_BRANCH".merge  refs/heads/"$VCSH_BRANCH"
        git config branch."$VCSH_BRANCH".remote origin
        git config branch."$VCSH_BRANCH".merge  refs/heads/"$VCSH_BRANCH"

-       git checkout -b $VCSH_BRANCH

        if [ $(git ls-remote origin "$VCSH_BRANCH" 2> /dev/null | wc -l ) -lt 1 ]; then
                info "remote is empty, not merging anything"
                exit
        fi
        git fetch origin "$VCSH_BRANCH"
        hook pre-merge
        if [ $(git ls-remote origin "$VCSH_BRANCH" 2> /dev/null | wc -l ) -lt 1 ]; then
                info "remote is empty, not merging anything"
                exit
        fi
        git fetch origin "$VCSH_BRANCH"
        hook pre-merge

-       git ls-tree -r --name-only origin/master | (while read object; do
+       git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do

                [ -e "$object" ] &&
                        error "'$object' exists." &&
                        VCSH_CONFLICT=1
                [ -e "$object" ] &&
                        error "'$object' exists." &&
                        VCSH_CONFLICT=1