From: Richard Hartmann <richih@debian.org>
Date: Mon, 9 Dec 2013 09:17:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'archwyrm/clone-trailing-slash-fix'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e6e78161ee7676c885a9bd6d6460afe528382bc7?hp=45e5afa0df709c1aa8a7733ca9dc9dd810407ac0

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

diff --git a/vcsh b/vcsh
index 81d94b8..b585f5c 100755
--- 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