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

diff --git a/README.md b/README.md
index 5257753ae8e147118686e72c645bcee7e6b83898..c0585d237617259e167c1ca5670d5d4c831a9bc8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -130,6 +130,8 @@ this:
 
     [DEFAULT]
     jobs = 5
+    # Use if your mr does not have vcsh support in mainline, yet
+    include = cat /usr/share/mr/vcsh
     include = cat ${XDG_CONFIG_HOME:-$HOME/.config}/mr/config.d/*
 
 ### repo.d ###

diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index f9a849fa5817478ce40769ad4bd979d66afd4b52..17be1a9ba72fe8bf6e517475bfa49ae0161425f1 100644 (file)
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -102,7 +102,7 @@ an interactive user.
   Write .gitignore.d/<repo> via git ls-files.
 
 * <repo> <gitcommand>:
-  Shortcut to run `vcsh` on a repo. Will prepend `git` to <command> by itself.
+  Shortcut to run `vcsh` on a repo. Will prepend `git` to <command>.
 
 * <repo>:
   Shortcut to run `vcsh enter <repo>`.

diff --git a/vcsh b/vcsh
index a57848743ccc4589d5e7195912a43702222c2bf3..3a8fefcaea7fc9d3f6549d775bd9f728e3c177e7 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -219,19 +219,19 @@ if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive'
 fi
 
 if [ "$1" = 'clone' ]; then
-       [ -z $2 ] && fatal "$1: please specify a remote" 1
+       [ -z "$2" ] && fatal "$1: please specify a remote" 1
        export VCSH_COMMAND="$1"
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-elif [ "$1" = 'delete' ]          ||
-     [ "$1" = 'enter' ]           ||
-     [ "$1" = 'init' ]            ||
-     [ "$1" = 'list-tracked-by' ] ||
-     [ "$1" = 'rename' ]          ||
-     [ "$1" = 'run' ]             ||
-     [ "$1" = 'setup' ]           ||
+elif [ "$1" = 'delete' ]           ||
+     [ "$1" = 'enter' ]            ||
+     [ "$1" = 'init' ]             ||
+     [ "$1" = 'list-tracked-by' ]  ||
+     [ "$1" = 'rename' ]           ||
+     [ "$1" = 'run' ]              ||
+     [ "$1" = 'setup' ]            ||
      [ "$1" = 'write-gitignore' ]; then
        [ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
        [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1