dnsmasq: clean up white space in dnsmasq.init

[openwrt/staging/lynxis/omap.git] / scripts / getver.sh

diff --git a/scripts/getver.sh b/scripts/getver.sh
index a65a6af22847f45e3188baeb527590b8a7cb58be..ecf048f4c1c88b308295e5d9d79e34bc2f70a12e 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -25,22 +25,22 @@ 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 --format="%h" -1)}"
                ;;
        esac