raspberrypi/rpi-update
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-update.git synced 2026-01-20 21:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
popcornmix
2013-01-30 20:09:09 +00:00
parent 37f02a03bd
commit c5d159c8b1
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rpi-update
View File

@@ -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"
# updating a depth=1 git tree doesn't work, so just kill it and clone a new one
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
}
function do_backup {