]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'master' of github.com:RichiH/vcsh
authorRichard Hartmann <richih.mailinglist@gmail.com>
Thu, 4 Apr 2013 10:51:38 +0000 (12:51 +0200)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Thu, 4 Apr 2013 10:51:38 +0000 (12:51 +0200)
1  2 
vcsh

diff --combined vcsh
index 0cd9340a45be5f7e073ef312624c9b0ea593c360,f222fff8abf02f08905180a4d63b0020415969ec..4e618dfbff60878636a10a629225d8e411541c2a
--- 1/vcsh
--- 2/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"