From: Richard Hartmann <richih@debian.org>
Date: Thu, 19 Sep 2013 21:41:27 +0000 (+0200)
Subject: Merge branch 'feature--shortnames'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/b32b489829142ea899ed50913fcff931ef051c27?ds=sidebyside;hp=--cc

Merge branch 'feature--shortnames'

Conflicts:
	vcsh
---

b32b489829142ea899ed50913fcff931ef051c27
diff --cc vcsh
index cf0c8cf,3e2a6b6..ab58f3a
--- a/vcsh
+++ b/vcsh
@@@ -397,27 -399,24 +419,25 @@@ if [ "$VCSH_COMMAND" = 'clone' ]; the
  	[ -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" = 'version' ]; then
+ elif [ "$VCSH_COMMAND" = 'version' ]; then
  	echo "$SELF $VERSION"
 +	git version
  	exit
- elif [ "$1" = 'which' ]; then
- 	[ -z "$2" ] && fatal "$1: please specify a filename" 1
- 	[ -n "$3" ] && fatal "$1: too many parameters" 1
- 	export VCSH_COMMAND="$1"
+ elif [ "$VCSH_COMMAND" = 'which' ]; then
+ 	[ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a filename" 1
+ 	[ -n "$3" ] && fatal "$VCSH_COMMAND: too many parameters" 1
  	export VCSH_COMMAND_PARAMETER="$2"
- elif [ "$1" = 'delete' ]           ||
-      [ "$1" = 'enter' ]            ||
-      [ "$1" = 'init' ]             ||
-      [ "$1" = 'list-tracked-by' ]  ||
-      [ "$1" = 'rename' ]           ||
-      [ "$1" = 'run' ]              ||
-      [ "$1" = 'upgrade' ]          ||
-      [ "$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
- 	[ "$1" = 'run'    -a -z "$3" ] && fatal "$1: please specify a command" 1
- 	export VCSH_COMMAND="$1"
+ elif [ "$VCSH_COMMAND" = 'delete' ]           ||
+      [ "$VCSH_COMMAND" = 'enter' ]            ||
+      [ "$VCSH_COMMAND" = 'init' ]             ||
+      [ "$VCSH_COMMAND" = 'list-tracked-by' ]  ||
+      [ "$VCSH_COMMAND" = 'rename' ]           ||
+      [ "$VCSH_COMMAND" = 'run' ]              ||
+      [ "$VCSH_COMMAND" = 'upgrade' ]          ||
+      [ "$VCSH_COMMAND" = 'write-gitignore' ]; then
+ 	[ -z $2 ]                                 && fatal "$VCSH_COMMAND: please specify repository to work on" 1
+ 	[ "$VCSH_COMMAND" = 'rename' -a -z "$3" ] && fatal "$VCSH_COMMAND: please specify a target name" 1
+ 	[ "$VCSH_COMMAND" = 'run'    -a -z "$3" ] && fatal "$VCSH_COMMAND: please specify a command" 1
  	export VCSH_REPO_NAME="$2"
  	export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
  	[ "$VCSH_COMMAND" = 'rename' ] && { export VCSH_REPO_NAME_NEW="$3";