scripts/getver.sh: avoid use of git rev-list --count

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

diff --git a/scripts/getver.sh b/scripts/getver.sh
index 60adc42e9244a7ae0e963baf8280b4401dc4aa4d..fa2e67692592fb14a267979fa05f99c23f0c81cf 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,14 +13,34 @@ try_version() {
 
 try_git() {
        git rev-parse --git-dir >/dev/null 2>&1 || return 1
-       REV="$(git describe --match reboot | sed "s/reboot-\([0-9]*\)-.*/\1/g")"
+
+       [ -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)"
+               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 | wc -l)"
+               REV="$(git rev-list reboot..$GET_REV | wc -l)"
+               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" ]
 }
 
 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" ]
 }