Fix missing blank repository name when cloning

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index f987fbfd5a24d6df99e8b1ef091a3e27fecdfd08..98b1e6bbe511d0e2a530775de54e9ed937454ae1 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -18,7 +18,8 @@
 basename() {
        # Implemented in shell to avoid spawning another process
        local file
 basename() {
        # Implemented in shell to avoid spawning another process
        local file

-       file="${1##*/}"
+       file="${1%/}"
+       file="${file##*/}"

        [ -z "$2" ] || file="${file%$2}"
        echo "$file"
 }
        [ -z "$2" ] || file="${file%$2}"
        echo "$file"
 }


@@ -163,7 +164,7 @@ clone() {
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                fatal "will stop after fetching and not try to merge!
        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
        git merge origin/master
        hook post-clone
        retire


@@ -419,6 +420,7 @@ if [ "$VCSH_COMMAND" = 'clone' ]; then
        [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
        [ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a remote" 1
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)

+       [ -z "$VCSH_REPO_NAME" ] && fatal "$VCSH_COMMAND: could not determine repository name" 1

        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 elif [ "$VCSH_COMMAND" = 'version' ]; then
        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 elif [ "$VCSH_COMMAND" = 'version' ]; then