X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fgetver.sh;h=9175f411db8345ab420fdb1edcaf0d20f858f12f;hb=d9d090e52082635a24aeaefdc6bfe61ab97f38bb;hp=a65a6af22847f45e3188baeb527590b8a7cb58be;hpb=7ed215437c784eb466302a5c01a4ee2fff9eac2d;p=openwrt%2Fopenwrt.git

diff --git a/scripts/getver.sh b/scripts/getver.sh
index a65a6af228..9175f411db 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -25,22 +25,23 @@ try_git() {
 		;;
 	*)
 		BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-		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)"
+		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)"
 		REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')"
 
 		if [ -n "$ORIGIN" ]; then
 			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 -n 1 --format="%h" $UPSTREAM_BASE)}"
+
 		;;
 	esac