From 4bd0edc8fdbb8c02c71dacdfc2d6ebef3716eda5 Mon Sep 17 00:00:00 2001 From: Magnus Kroken Date: Sat, 14 Jan 2017 22:34:01 +0100 Subject: [PATCH] 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 Signed-off-by: Felix Fietkau --- scripts/getver.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/getver.sh b/scripts/getver.sh index ecf048f4c1c..9175f411db8 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 -- 2.30.2