From: Richard Hartmann <richih.mailinglist@gmail.com>
Date: Thu, 4 Apr 2013 10:51:38 +0000 (+0200)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/de2510255802768699751d54d118c4fc026ff8f4?ds=inline;hp=-c

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

de2510255802768699751d54d118c4fc026ff8f4
diff --combined vcsh
index 0cd9340,f222fff..4e618df
--- a/vcsh
+++ b/vcsh
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  # This program is licensed under the GNU GPL version 2 or later.
 -# (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 2011-2012
 +# (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 2011-2013
  # For details, see LICENSE. To submit patches, you have to agree to
  # license your code under the GNU GPL version 2 or later.
  
@@@ -9,7 -9,6 +9,7 @@@
  # explain the choice of GPLv2+ over GPLv3+.
  # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain
  # full compability with git. In case git ever changes its licensing terms,
 +# which is admittedly extremely unlikely to the point of being impossible,
  # this software will most likely follow suit.
  
  SELF=$(basename $0)
@@@ -215,7 -214,7 +215,7 @@@ rename() 
  run() {
  	hook pre-run
  	use
- 	$VCSH_EXTERNAL_COMMAND
+ 	"$@"
  	hook post-run
  }
  
@@@ -305,7 -304,7 +305,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
@@@ -316,7 -315,7 +316,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"
@@@ -350,6 -349,6 +350,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"