From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Sat, 30 Mar 2013 23:11:58 +0000 (+0100)
Subject: Merge branch 'debbug-699093'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/ce82402aecaca10b283859fe4f198d470d386970?hp=-c

Merge branch 'debbug-699093'
---

ce82402aecaca10b283859fe4f198d470d386970
diff --combined vcsh
index bd0eca1,194bb21..f222fff
--- a/vcsh
+++ b/vcsh
@@@ -138,7 -138,7 +138,7 @@@ clone() 
  delete() {
  	cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
  	use
 -	info "This operation WILL DETROY DATA!"
 +	info "This operation WILL DESTROY DATA!"
  	files=$(git ls-files)
  	echo "These files will be deleted:
  
@@@ -151,7 -151,7 +151,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
 -	rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'"
 +	rm -rf "$GIT_DIR" || error "could not delete '$GIT_DIR'"
  }
  
  enter() {
@@@ -214,7 -214,7 +214,7 @@@ rename() 
  run() {
  	hook pre-run
  	use
- 	$VCSH_EXTERNAL_COMMAND
+ 	"$@"
  	hook post-run
  }
  
@@@ -304,7 -304,7 +304,7 @@@ elif [ "$1" = 'delete' ]           |
  	export VCSH_REPO_NAME="$2"
  	export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
  	[ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"
- 	[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
+ 	[ "$VCSH_COMMAND" = 'run' ] && shift 2
  	[ "$VCSH_COMMAND" = 'write-gitignore' ]
  elif [ "$1" = 'list' ] ||
       [ "$1" = 'list-tracked' ]; then
@@@ -315,7 -315,7 +315,7 @@@ elif [ -n "$2" ]; the
  	export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
  	[ -d $GIT_DIR ] || { help; exit 1; }
  	shift 1
- 	export VCSH_EXTERNAL_COMMAND="git $*"
+ 	set -- "git" "$@"
  elif [ -n "$1" ]; then
  	export VCSH_COMMAND='enter'
  	export VCSH_REPO_NAME="$1"
@@@ -349,6 -349,6 +349,6 @@@ don
  verbose "$VCSH_COMMAND begin"
  export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
  hook pre-command
- $VCSH_COMMAND
+ $VCSH_COMMAND "$@"
  hook post-command
  verbose "$VCSH_COMMAND end, exiting"