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?ds=inline;hp=-c

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

e6e78161ee7676c885a9bd6d6460afe528382bc7
diff --combined vcsh
index 81d94b8,98b1e6b..b585f5c
--- a/vcsh
+++ b/vcsh
@@@ -18,7 -18,8 +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"
  }
@@@ -288,7 -289,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 +420,7 @@@ if [ "$VCSH_COMMAND" = 'clone' ]; the
  	[ -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