From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Wed, 30 Nov 2011 02:44:14 +0000 (+0100)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/881deb41fb7c5af8c5feedd075c780f3ce94df99

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

Conflicts:
	vcsh
---

881deb41fb7c5af8c5feedd075c780f3ce94df99
diff --cc vcsh
index 665c61a,550c36f..8ca079a
--- a/vcsh
+++ b/vcsh
@@@ -199,16 -200,9 +199,8 @@@ elif [ "$1" = 'delete' ] |
  	export VCSH_REPO_NAME="$2"
  	export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
  	[ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
- 	if [ "$VCSH_COMMAND" = 'run' ]; then
- 		shift 2
- 		export VCSH_EXTERNAL_COMMAND="$*"
- 		# Did we receive a directory instead of a name? Mangle the input to fit normal operation!
- 		if echo $VCSH_REPO_NAME | grep -q '/'; then
- 			export GIT_DIR=$VCSH_REPO_NAME
- 			export VCSH_REPO_NAME=$(basename $VCSH_REPO_NAME .git)
- 		fi
- 	fi
+ 	[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
  	[ "$VCSH_COMMAND" = 'seed-gitignore' ]
 -#	[ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
  elif [ "$1" = 'list' ]; then
  	export VCSH_COMMAND="$1"
  elif [ -n "$1" ]; then