From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Fri, 10 Feb 2012 16:39:54 +0000 (+0100)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/33de26d293a95451545def939ddbeb287d068cc8?hp=-c

Merge branch 'master' of github.com:RichiH/vcsh
---

33de26d293a95451545def939ddbeb287d068cc8
diff --combined vcsh
index a578487,41d80e3..3a8fefc
--- a/vcsh
+++ b/vcsh
@@@ -100,7 -100,7 +100,7 @@@ To continue, type 'Yes, do as I say'
  	for file in $files; do
  		rm -f $file || info "could not delete '$file', continuing with deletion"
  	done
 -	rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'"
 +	rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'"
  }
  
  enter() {
@@@ -219,19 -219,19 +219,19 @@@ if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] 
  fi
  
  if [ "$1" = 'clone' ]; then
- 	[ -z $2 ] && fatal "$1: please specify a remote" 1
+ 	[ -z "$2" ] && fatal "$1: please specify a remote" 1
  	export VCSH_COMMAND="$1"
  	GIT_REMOTE="$2"
  	[ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
  	export VCSH_REPO_NAME
  	export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
- elif [ "$1" = 'delete' ]          ||
-      [ "$1" = 'enter' ]           ||
-      [ "$1" = 'init' ]            ||
-      [ "$1" = 'list-tracked-by' ] ||
-      [ "$1" = 'rename' ]          ||
-      [ "$1" = 'run' ]             ||
-      [ "$1" = 'setup' ]           ||
+ elif [ "$1" = 'delete' ]           ||
+      [ "$1" = 'enter' ]            ||
+      [ "$1" = 'init' ]             ||
+      [ "$1" = 'list-tracked-by' ]  ||
+      [ "$1" = 'rename' ]           ||
+      [ "$1" = 'run' ]              ||
+      [ "$1" = 'setup' ]            ||
       [ "$1" = 'write-gitignore' ]; then
  	[ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
  	[ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1