]> 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:

projects / code / vcsh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5314563 a0a5e21)
Merge branch 'master' of github.com:RichiH/vcsh
authorRichard Hartmann <richih.mailinglist@gmail.com>
Wed, 30 Nov 2011 02:44:14 +0000 (03:44 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Wed, 30 Nov 2011 02:44:14 +0000 (03:44 +0100)
Conflicts:
vcsh

1  2 
doc/vcsh.1.ronn patch | diff1 | diff2 | blob | history
vcsh patch | diff1 | diff2 | blob | history

diff --cc doc/vcsh.1.ronn
Simple merge
diff --cc vcsh
index 665c61a348ebead34defdf168aa491ad973113e8,550c36fc4aad326f34f1ea5ac8f5976633beaea2..8ca079a05fc232786ce6afaaac444a31c6590725
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -199,16 -200,9 +199,8 @@@ elif [ "$1" = 'delete' ] |
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
        [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
-       if [ "$VCSH_COMMAND" = 'run' ]; then
-               shift 2
-               export VCSH_EXTERNAL_COMMAND="$*"
-               # Did we receive a directory instead of a name? Mangle the input to fit normal operation!
-               if echo $VCSH_REPO_NAME | grep -q '/'; then
-                       export GIT_DIR=$VCSH_REPO_NAME
-                       export VCSH_REPO_NAME=$(basename $VCSH_REPO_NAME .git)
-               fi
-       fi
+       [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
        [ "$VCSH_COMMAND" = 'seed-gitignore' ]
 -#     [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
  elif [ "$1" = 'list' ]; then
        export VCSH_COMMAND="$1"
  elif [ -n "$1" ]; then
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.