Merge remote-tracking branch 'archwyrm/clone-trailing-slash-fix'

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 3cea66646dc3ec60a87881b03ca1d94c4a9605cb..b585f5c53ee2e848cfa02477072f8180ca7c4dd5 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -18,13 +18,14 @@
 basename() {
        # Implemented in shell to avoid spawning another process
        local file
-       file="${1##*/}"
+       file="${1%/}"
+       file="${file##*/}"
        [ -z "$2" ] || file="${file%$2}"
        echo "$file"
 }
 
 SELF=$(basename $0)
-VERSION='1.20130909'
+VERSION='1.20130909.git-HEAD'
 
 fatal() {
        echo "$SELF: fatal: $1" >&2
@@ -159,11 +160,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
@@ -288,7 +289,7 @@ rename() {
        # Now that the repository has been renamed, we need to fix up its configuration
        # Overwrite old name..
        GIT_DIR="$GIT_DIR_NEW"
-       $VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW"
+       VCSH_REPO_NAME="$VCSH_REPO_NAME_NEW"
        # ..and clobber all old configuration
        upgrade
 }
@@ -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 "$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