From: Magnus Kroken <mkroken@gmail.com>
Date: Sat, 14 Jan 2017 21:34:01 +0000 (+0100)
Subject: scripts/getver.sh: append short git hash based on upstream commit
X-Git-Tag: v17.01.1~80
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=4bd0edc8fdbb8c02c71dacdfc2d6ebef3716eda5;hp=9451cd7c5b6ccce9e790159fb8d71b054fa8325f;ds=sidebyside

scripts/getver.sh: append short git hash based on upstream commit

The short git hash suffix printed by getver.sh is taken from the
latest local commit, change this to use the hash from latest
upstream commit if available. This is considered the intended
behavior based on commit message a642a11faca87e2a7bddc1fadb54253e2fc26e84,
introducing getver.sh.

Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

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