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

Conflicts:
	vcsh

diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index 26615f6b49b78415aed2fd5118cf423144522be1..0ea94286e26fc64ca2e8b4637dbd9b3976031b41 100644 (file)
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -75,6 +75,13 @@ an interactive user.
   Run command with <$GIT_DIR> and <$GIT_WORK_TREE> set. Allows you to run any
   and all commands without any restrictions. Use with care.
 
+  Please note that there is a somewhat magic feature for run. Instead of <repo>
+  it accepts <path>, as well. Anything that has a slash in it will be assumed to
+  be a path. `vcsh run` will then operate on this directory instead of the one
+  normally generated from the repository's name.
+  This is needed to support mr and other scripts properly and of no concern to
+  an interactive user.
+
 * seed-gitignore:
   Seed .gitignore.d/<repo> from git ls-files.
 

diff --git a/vcsh b/vcsh
index 550c36fc4aad326f34f1ea5ac8f5976633beaea2..8ca079a05fc232786ce6afaaac444a31c6590725 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -n "$VCSH_DEBUG" ]      && set -x
+[ -n "$VCSH_DEBUG" ]      && set -vx
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
@@ -168,8 +168,7 @@ setup() {
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
        git config vcsh.vcsh         'true'
-       touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME" || error "could not touch '$HOME/.gitignore.d/$VCSH_REPO_NAME'"
-       git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+       [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME"
 }
 
 use() {
@@ -202,7 +201,6 @@ elif [ "$1" = 'delete' ] ||
        [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
        [ "$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