X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fgetver.sh;h=ecf048f4c1c88b308295e5d9d79e34bc2f70a12e;hb=b2cd9b80ef3e6b48a9524b85cae4b3f30bb1b91a;hp=e718485852d427300892f412dba320a494a1c23f;hpb=efdd3bf5fbab94b3f84e8a285e83ef36e39b3e8b;p=openwrt%2Fopenwrt.git diff --git a/scripts/getver.sh b/scripts/getver.sh index e718485852..ecf048f4c1 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -33,14 +33,14 @@ try_git() { UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)" UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE | wc -l | awk '{print $1}')" else - UPSTREAM_REV=$REV + UPSTREAM_REV=0 fi if [ "$REV" -gt "$UPSTREAM_REV" ]; then REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))" fi - REV="${REV:+r$REV}" + REV="${REV:+r$REV-$(git log --format="%h" -1)}" ;; esac