ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-31 00:24:12 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Magnus Kroken 2017-01-14 22:34:01 +01:00 committed by Jo-Philipp Wich
parent 9451cd7c5b
commit 4bd0edc8fd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/getver.sh
View File

@ -40,7 +40,8 @@ try_git() {
REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))" REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
fi fi
REV="${REV:+r$REV-$(git log --format="%h" -1)}" REV="${REV:+r$REV-$(git log -n 1 --format="%h" $UPSTREAM_BASE)}"
;; ;;
esac esac