Handle errors during `git fetch origin`

This commit is contained in:
Tim Byrne 2016-03-30 03:31:21 -05:00
parent 301b537f15
commit bbec7dd540
1 changed files with 5 additions and 1 deletions

6
yadm
View File

@ -148,7 +148,11 @@ function clone() {
#; fetch / merge (and possibly fallback to reset)
debug "Doing an initial fetch of the origin"
git fetch origin
git fetch origin || {
debug "Removing repo after failed clone"
rm -rf "$YADM_REPO"
error_out "Unable to fetch origin $1"
}
debug "Doing an initial merge of origin/master"
git merge origin/master || {
debug "Merge failed, doing a reset."