Release 1.20131214

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index f987fbfd5a24d6df99e8b1ef091a3e27fecdfd08..2b7528f2864986c0530334a23ee50c4c756274bf 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -15,16 +15,8 @@
 # This should always be the first line of code to facilitate debugging
 [ -n "$VCSH_DEBUG" ] && set -vx
 
 # This should always be the first line of code to facilitate debugging
 [ -n "$VCSH_DEBUG" ] && set -vx
 

-basename() {
-       # Implemented in shell to avoid spawning another process
-       local file
-       file="${1##*/}"
-       [ -z "$2" ] || file="${file%$2}"
-       echo "$file"
-}
-

 SELF=$(basename $0)
 SELF=$(basename $0)

-VERSION='1.20130909.git-HEAD'
+VERSION='1.20131214'

 
 fatal() {
        echo "$SELF: fatal: $1" >&2
 
 fatal() {
        echo "$SELF: fatal: $1" >&2


@@ -163,7 +155,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


@@ -288,7 +280,7 @@ rename() {
        # Now that the repository has been renamed, we need to fix up its configuration
        # Overwrite old name..
        GIT_DIR="$GIT_DIR_NEW"
        # 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
 }
        # ..and clobber all old configuration
        upgrade
 }


@@ -419,6 +411,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