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

diff --git a/PACKAGING b/PACKAGING
index 16eaed8134415a3c800fbf1ee7c97b5709565a36..92c1dd50d0d0bcddad814852b492fc55dd67570e 100644 (file)
--- 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 a3c51ba2709d385bc9ba7f37b2eb12066722f18f..2a87fc958545019ed66e7e317d3199a75ba42845 100644 (file)
--- 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 0cd9340a45be5f7e073ef312624c9b0ea593c360..4e618dfbff60878636a10a629225d8e411541c2a 100755 (executable)
--- 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"