]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'feature--improve_clone_errors'
authorRichard Hartmann <richih@debian.org>
Thu, 23 Oct 2014 18:03:50 +0000 (20:03 +0200)
committerRichard Hartmann <richih@debian.org>
Thu, 23 Oct 2014 18:03:50 +0000 (20:03 +0200)
1  2 
vcsh

diff --combined vcsh
index ea748357b20974a56e289f6e601696a113d05d02,cacd1b1bd19c63484881767a91fb9684aa4f39c0..a12bc4962f9f8b31cc14b03fe3739d9213e4606f
--- 1/vcsh
--- 2/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