From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 2 Dec 2016 11:07:19 +0000 (+0100)
Subject: scripts: getver.sh: append Git short hash to revision
X-Git-Tag: v17.01.0-rc1~648
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a642a11faca87e2a7bddc1fadb54253e2fc26e84;p=openwrt%2Fopenwrt.git

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 d5f29864b5..ecf048f4c1 100755
--- 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