scripts: fix revision calculation using new "main" branch

Fix revision calculation when local branch is rebased on new "main" branch
instead of "master".

Signed-off-by: Marius Dinu <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/15538
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 61906040b18f974c3edd263e6ac14c22d3d5eda2..0659d8004a0170800ecf0d28bd7649355ac84cee 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -26,7 +26,7 @@ try_git() {
        *)
                BRANCH="$(git rev-parse --abbrev-ref HEAD)"
                ORIGIN="$(git rev-parse --verify --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
-               [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name master@{u} 2>/dev/null)"
+               [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name main@{u} 2>/dev/null)"
                REV="$(git rev-list ${REBOOT}..$GET_REV 2>/dev/null | wc -l | awk '{print $1}')"
 
                if [ -n "$ORIGIN" ]; then