From: Richard Hartmann <richih@debian.org>
Date: Thu, 12 Sep 2013 21:30:27 +0000 (+0200)
Subject: vcsh: Proper quoting for "$VCSH_BRANCH"
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/a171b8ba4a69de0bb8d0afced0807757a1b4c216

vcsh: Proper quoting for "$VCSH_BRANCH"
---

diff --git a/vcsh b/vcsh
index 86a3711..69b6c4c 100755
--- a/vcsh
+++ b/vcsh
@@ -147,8 +147,8 @@ clone() {
 	init
 	git remote add origin "$GIT_REMOTE"
 	git config branch."$VCSH_BRANCH".remote origin
-	git config branch."$VCSH_BRANCH".merge  refs/heads/$VCSH_BRANCH
-	if [ $(git ls-remote origin $VCSH_BRANCH 2> /dev/null | wc -l ) -lt 1 ]; then
+	git config branch."$VCSH_BRANCH".merge  refs/heads/"$VCSH_BRANCH"
+	if [ $(git ls-remote origin "$VCSH_BRANCH" 2> /dev/null | wc -l ) -lt 1 ]; then
 		info "remote is empty, not merging anything"
 		exit
 	fi
@@ -162,7 +162,7 @@ clone() {
 	[ x"$VCSH_CONFLICT" = x'1' ]) &&
 		fatal "will stop after fetching and not try to merge!
   Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
-	git merge origin/master # XXX
+	git merge origin/"$VCSH_BRANCH"
 	hook post-merge
 	hook post-clone
 	retire