mirror of
https://github.com/raspberrypi/rpi-update.git
synced 2026-01-20 21:13:38 +08:00
rpi-update incorrectly detects latest git commit when called with BRANCH=next, because 'master' is hardcoded into the check
This commit is contained in:
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user