scripts/getver.sh: improve revision output

[openwrt/staging/dedeckeh.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 340ed6862cf7cc566262ea64bfdc33196926fc4d..4c8fab079c14aa3f1669865f892b51468e642f78 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -3,6 +3,8 @@ export LANG=C
 export LC_ALL=C
 [ -n "$TOPDIR" ] && cd $TOPDIR
 
+GET_REV=$1
+
 try_version() {
        [ -f version ] || return 1
        REV="$(cat version)"
@@ -11,8 +13,27 @@ try_version() {
 
 try_git() {
        git rev-parse --git-dir >/dev/null 2>&1 || return 1
-       REV="$(git rev-list reboot..HEAD --count)"
-       REV="${REV:+r$REV}"
+
+       [ -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 --count)"
+               REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
+               ;;
+       *)
+               UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
+               UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE --count)"
+               REV="$(git rev-list reboot..$GET_REV --count)"
+               if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
+                       REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
+               else
+                       REV="${REV:+r$REV}"
+               fi
+               ;;
+       esac
+
        [ -n "$REV" ]
 }