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

Merge pull request #91 from Vincent-C/master

Browse Source 
rpi-update incorrectly detects latest git commit when called with BRANCH=next
This commit is contained in:
popcornmix
2013-05-05 02:47:34 -07:00
parent 7fc78f81b1 b095daee22
commit 3b81f95014
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpi-update
View File

@@ -201,7 +201,7 @@ if [[ ${FW_REV} != "" ]]; then
do_update "updated to revision ${FW_REV}" do_update "updated to revision ${FW_REV}"
elif [[ -f "${FW_REPOLOCAL}/.git/config" ]]; then elif [[ -f "${FW_REPOLOCAL}/.git/config" ]]; then
# ask git server version before spending time cloning # ask git server version before spending time cloning
GITREV=$(git ls-remote -h ${REPO_URI} refs/heads/master | awk '{print $1}') GITREV=$(git ls-remote -h ${REPO_URI} refs/heads/${BRANCH} | awk '{print $1}')
if [[ -f "${FW_PATH}/.firmware_revision" ]] && [[ $(cat "${FW_PATH}/.firmware_revision") == "$GITREV" ]]; then if [[ -f "${FW_PATH}/.firmware_revision" ]] && [[ $(cat "${FW_PATH}/.firmware_revision") == "$GITREV" ]]; then
echo " *** Your firmware is already up to date" echo " *** Your firmware is already up to date"
# no changes made, nothing to finalise # no changes made, nothing to finalise