mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 16:31:13 +00:00
scripts/getver.sh: stop relying on the reboot tag
It may not be present when cloning a staging tree or another fork Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
55761205ef
commit
7ed215437c
@ -12,6 +12,7 @@ try_version() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try_git() {
|
try_git() {
|
||||||
|
REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a
|
||||||
git rev-parse --git-dir >/dev/null 2>&1 || return 1
|
git rev-parse --git-dir >/dev/null 2>&1 || return 1
|
||||||
|
|
||||||
[ -n "$GET_REV" ] || GET_REV="HEAD"
|
[ -n "$GET_REV" ] || GET_REV="HEAD"
|
||||||
@ -19,18 +20,18 @@ try_git() {
|
|||||||
case "$GET_REV" in
|
case "$GET_REV" in
|
||||||
r*)
|
r*)
|
||||||
GET_REV="$(echo $GET_REV | tr -d 'r')"
|
GET_REV="$(echo $GET_REV | tr -d 'r')"
|
||||||
BASE_REV="$(git rev-list reboot..HEAD | wc -l | awk '{print $1}')"
|
BASE_REV="$(git rev-list ${REBOOT}..HEAD | wc -l | awk '{print $1}')"
|
||||||
REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
|
REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
|
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
|
||||||
ORIGIN="$(git rev-parse --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
|
ORIGIN="$(git rev-parse --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)"
|
||||||
[ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --symbolic-full-name master@{u} 2>/dev/null)"
|
[ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --symbolic-full-name master@{u} 2>/dev/null)"
|
||||||
REV="$(git rev-list reboot..$GET_REV | wc -l | awk '{print $1}')"
|
REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')"
|
||||||
|
|
||||||
if [ -n "$ORIGIN" ]; then
|
if [ -n "$ORIGIN" ]; then
|
||||||
UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)"
|
UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)"
|
||||||
UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
|
UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE | wc -l | awk '{print $1}')"
|
||||||
else
|
else
|
||||||
UPSTREAM_REV=$REV
|
UPSTREAM_REV=$REV
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user