From: Richard Hartmann <richih@debian.org>
Date: Thu, 23 Oct 2014 18:17:04 +0000 (+0200)
Subject: Merge branch 'feature--overlay_functions'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/6dd74c1a57e084da1ec38bac52b48bda43d31334?hp=6480c1913a9853176fe527079680242dbf4d40a4

Merge branch 'feature--overlay_functions'
---

diff --git a/vcsh b/vcsh
index 301151a..53ce905 100755
--- a/vcsh
+++ b/vcsh
@@ -24,6 +24,7 @@ SELF=$(basename $0)
 
 fatal() {
 	echo "$SELF: fatal: $1" >&2
+	[ -z $2] && exit 1
 	exit $2
 }
 
@@ -149,9 +150,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