scripts: getver.sh: append Git short hash to revision

Change getver.sh to append a short Git commit hash to the end of the artifical
revision number. This way we still have order- and comparable commit numbers
but also a direct relation to the Git commit.

The new output format will look like "r2400+2-882472e" for dirty trees or like
"r2402-882472e" for clean ones.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/scripts/getver.sh b/scripts/getver.sh
index d5f29864b57b24b2dab693ad88c58da4b4dcc623..ecf048f4c1c88b308295e5d9d79e34bc2f70a12e 100755 (executable)
--- a/scripts/getver.sh
+++ b/scripts/getver.sh
@@ -40,7 +40,7 @@ try_git() {
                        REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
                fi
 
-               REV="${REV:+r$REV}"
+               REV="${REV:+r$REV-$(git log --format="%h" -1)}"
                ;;
        esac