Permalink
Browse files

Updating a depth=1 git tree doesn't work, so just kill it and clone a…

… new one
  • Loading branch information...
1 parent 37f02a0 commit c5d159c8b128ef1dd5ab0ad2f5593ab8c253391c @popcornmix popcornmix committed Jan 30, 2013
Showing with 3 additions and 21 deletions.
  1. +3 −21 rpi-update
View
@@ -126,27 +126,9 @@ function download_repo {
}
function update_repo {
- echo " *** Updating firmware (this may take a few minutes)"
- set +e
- eval ${GITCMD} fetch --depth=1
- RETVAL=$?
- set -e
- if [[ ${RETVAL} -ne 0 ]]; then
- echo " !!! Failed to fetch updated firmware files, trying a fresh checkout"
- rm -rf ${FW_REPOLOCAL}
- download_repo
- return
- fi
- set +e
- eval ${GITCMD} reset --hard && eval ${GITCMD} clean -f -d && eval ${GITCMD} merge origin/master -m "automerge"
- RETVAL=$?
- set -e
- if [[ ${RETVAL} -ne 0 ]]; then
- echo " !!! Failed to merge updated firmware files, trying a fresh checkout"
- rm -rf ${FW_REPOLOCAL}
- download_repo
- return
- fi
+ # updating a depth=1 git tree doesn't work, so just kill it and clone a new one
+ rm -rf ${FW_REPOLOCAL}
+ download_repo
}
function do_backup {

0 comments on commit c5d159c

Please sign in to comment.