]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Fix missing blank repository name when cloning
authorMarkus Martin <markus@archwyrm.net>
Sun, 1 Dec 2013 21:42:33 +0000 (16:42 -0500)
committerMarkus Martin <markus@archwyrm.net>
Sun, 1 Dec 2013 21:48:56 +0000 (16:48 -0500)
If the repository path given to 'vcsh clone' contains a trailing slash,
the resulting cloned directory will be '.git' and vcsh will not
recognize the cloned repository by name. This change ensures that a
trailing slash will be stripped and the repository name will be
populated.

The previous faulty behavior is due to the custom implementation of the
basename command first introduced in 794f0aac.

vcsh

diff --git a/vcsh b/vcsh
index 39240093afd50dd0a47b528abb2249fedf9e1d27..98b1e6bbe511d0e2a530775de54e9ed937454ae1 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -18,7 +18,8 @@
 basename() {
        # Implemented in shell to avoid spawning another process
        local file
-       file="${1##*/}"
+       file="${1%/}"
+       file="${file##*/}"
        [ -z "$2" ] || file="${file%$2}"
        echo "$file"
 }
@@ -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