From: Richard Hartmann <richih@debian.org>
Date: Sun, 26 Feb 2017 22:08:18 +0000 (+0100)
Subject: Merge branch 'master' of github.com:RichiH/vcsh
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/36a7cedf196793a6d99f9d3ba2e69805cfff23ab?hp=8ae70a31cd3553ea94502b9784ba4dc5bee274c4

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

diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index d5ee0dc..45b8c83 100644
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -41,7 +41,7 @@ vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME
 
 `vcsh` write-gitignore <repo>
 
-`vcsh` <repo> <git command>
+`vcsh` <repo> <gitcommand>
 
 `vcsh` <repo>
 
@@ -173,7 +173,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>.
+  Shortcut to run `git` commands on a repo. Will prepend `git` to <gitcommand>.
 
 * <repo>:
   Shortcut to run `vcsh enter <repo>`.
diff --git a/vcsh b/vcsh
index f9bea25..de1b419 100755
--- a/vcsh
+++ b/vcsh
@@ -476,7 +476,7 @@ write_gitignore() {
 
 	use
 	cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
-	local GIT_VERSION=$(git --version)
+	local GIT_VERSION="$(git --version)"
 	local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\..*/\1/p')
 	local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\.\([0-9]\)\..*/\2/p')
 	OLDIFS=$IFS