X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fgetver.sh;h=e718485852d427300892f412dba320a494a1c23f;hp=7248ca77531be8c7b08b1450cf9140fee3ada37b;hb=b306f8254f5c03d0d73bacb20255c96752fc7748;hpb=6fa03d63d4d34ef38a5fde5292cb7f65c06d56b2

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 7248ca7753..e718485852 100755
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -3,32 +3,56 @@ export LANG=C
 export LC_ALL=C
 [ -n "$TOPDIR" ] && cd $TOPDIR
 
+GET_REV=$1
+
 try_version() {
 	[ -f version ] || return 1
 	REV="$(cat version)"
 	[ -n "$REV" ]
 }
 
-try_svn() {
-	[ -d .svn ] || return 1
-	REV="$(svn info -r COMMITTED | awk '/^Revision:/ { print $2 }')"
-	REV="${REV:+r$REV}"
-	[ -n "$REV" ]
-}
-
 try_git() {
-	[ -d .git ] || return 1
-	REV="$(git log | grep -m 1 git-svn-id | awk '{ gsub(/.*@/, "", $2); print $2 }')"
-	REV="${REV:+r$REV}"
+	REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a
+	git rev-parse --git-dir >/dev/null 2>&1 || return 1
+
+	[ -n "$GET_REV" ] || GET_REV="HEAD"
+
+	case "$GET_REV" in
+	r*)
+		GET_REV="$(echo $GET_REV | tr -d 'r')"
+		BASE_REV="$(git rev-list ${REBOOT}..HEAD | wc -l | awk '{print $1}')"
+		REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
+		;;
+	*)
+		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)"
+		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
+		fi
+
+		if [ "$REV" -gt "$UPSTREAM_REV" ]; then
+			REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
+		fi
+
+		REV="${REV:+r$REV}"
+		;;
+	esac
+
 	[ -n "$REV" ]
 }
 
 try_hg() {
 	[ -d .hg ] || return 1
 	REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')"
-	REV="${REV:+$REV}"
+	REV="${REV:+r$REV}"
 	[ -n "$REV" ]
 }
 
-try_version || try_svn || try_git || try_hg || REV="unknown"
+try_version || try_git || try_hg || REV="unknown"
 echo "$REV"