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?hp=b87c7a220364f02b69b7d92bf8cd8070926a6058

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

diff --git a/PACKAGING b/PACKAGING
index 16eaed8..92c1dd5 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -11,6 +11,13 @@ the upstream repository
 
 Ubuntu imports Debian's package automagically.
 
+# Mac OS X
+
+Homebrew does not require any packaging information within this repository.
+A separate branch with a statically compiled manpage and release tags is
+provided to ease packaging. The static manpage because Homebrew lacks Ronn;
+the tag so github generates tarballs Homebrew can be pointed at.
+
 # Anything else
 
 If you are maintaining a package for a different distribution, please get
diff --git a/changelog b/changelog
index a3c51ba..2a87fc9 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+2013-03-31  Richard Hartmann <richih.mailinglist@gmail.com>
+
+	* Release 1.1
+	* Documentation fixes
+	* Use rm -f when removing a git repo
+	* Fix quoting bug (Debian #699093)
+
 2013-02-13  Richard Hartmann <richih.mailinglist@gmail.com>
 
 	* Release 1.0.1
diff --git a/vcsh b/vcsh
index 0cd9340..4e618df 100755
--- a/vcsh
+++ b/vcsh
@@ -215,7 +215,7 @@ rename() {
 run() {
 	hook pre-run
 	use
-	$VCSH_EXTERNAL_COMMAND
+	"$@"
 	hook post-run
 }
 
@@ -305,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 +316,7 @@ elif [ -n "$2" ]; then
 	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 +350,6 @@ done
 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"