Archives/TheLocehiliosan_yadm
1
0
Fork 0
mirror of https://github.com/TheLocehiliosan/yadm synced 2024-10-27 20:34:27 +00:00
Code Issues Releases Wiki Activity

Handle errors during git fetch origin

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yadm
View File

@ -148,7 +148,11 @@ function clone() {
#; fetch / merge (and possibly fallback to reset) #; fetch / merge (and possibly fallback to reset)
debug "Doing an initial fetch of the origin" 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" debug "Doing an initial merge of origin/master"
git merge origin/master || { git merge origin/master || {
debug "Merge failed, doing a reset." debug "Merge failed, doing a reset."