From: Richard Hartmann <richih@debian.org>
Date: Thu, 23 Oct 2014 18:03:50 +0000 (+0200)
Subject: Merge branch 'feature--improve_clone_errors'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/fcd9f1bdee4ace55ecc7822b046ae12ad859c90d?ds=sidebyside;hp=-c

Merge branch 'feature--improve_clone_errors'
---

fcd9f1bdee4ace55ecc7822b046ae12ad859c90d
diff --combined vcsh
index ea74835,cacd1b1..a12bc49
--- a/vcsh
+++ b/vcsh
@@@ -24,7 -24,6 +24,7 @@@ SELF=$(basename $0
  
  fatal() {
  	echo "$SELF: fatal: $1" >&2
 +	[ -z $2] && exit 1
  	exit $2
  }
  
@@@ -149,9 -148,10 +149,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