aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMagnus Kroken <mkroken@gmail.com>2017-01-14 22:34:01 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-01 17:48:45 +0100
commit289f2a8ce36caff6c9ec65585b397f64ffd0f244 (patch)
treebb605a2b856d7de99190c33030339d462738d56f /scripts
parent70973dd30d29c9d7e4402578da1d36e05e3d142d (diff)
downloadupstream-289f2a8ce36caff6c9ec65585b397f64ffd0f244.tar.gz
upstream-289f2a8ce36caff6c9ec65585b397f64ffd0f244.tar.bz2
upstream-289f2a8ce36caff6c9ec65585b397f64ffd0f244.zip
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/getver.sh3
1 files changed, 2 insertions, 1 deletions
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