From: Richard Hartmann <richih@debian.org>
Date: Tue, 21 Oct 2014 21:25:42 +0000 (+0200)
Subject: vcsh: Improve error handling of clone()
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/589f2baa284376cbbe5e98d5f5ff145a9441dffc

vcsh: Improve error handling of clone()

May fix https://github.com/RichiH/vcsh/issues/122
---

diff --git a/vcsh b/vcsh
index 0b4c452..cacd1b1 100755
--- a/vcsh
+++ b/vcsh
@@ -148,9 +148,10 @@ clone() {
 	git remote add origin "$GIT_REMOTE"
 	git config branch.master.remote origin
 	git config branch.master.merge  refs/heads/master
-	if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then
-		info "remote is empty, not merging anything"
-		exit
+	VCSH_CLONE_ERROR=$(git ls-remote origin master 2>&1)
+	if [ -n "$VCSH_CLONE_ERROR" ]; then
+		rm -rf "$GIT_DIR"
+		fatal "$VCSH_CLONE_ERROR" 1
 	fi
 	git fetch
 	hook pre-merge