domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/getver.sh: improve revision output

Browse Source 
Change the revision output to r<upstream-revision>+<local commits> so
it is easier to get the base revision (and see if there are local
commits).

Example:
$ ./scripts/getver.sh
r794+3
$

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
Jonas Gorski
2016-06-25 14:23:30 +02:00
parent 1001b5d77c
commit 15b88df87f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/getver.sh
View File

@@ -23,9 +23,14 @@ try_git() {
REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))" REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))"
;; ;;
*) *)
UPSTREAM_BASE="$(git merge-base $GET_REV origin/master)"
UPSTREAM_REV="$(git rev-list reboot..$UPSTREAM_BASE --count)"
REV="$(git rev-list reboot..$GET_REV --count)" REV="$(git rev-list reboot..$GET_REV --count)"
if [ -n "$REV" -a -n "$UPSTREAM_REV" -a "$REV" -gt "$UPSTREAM_REV" ]; then
REV="r${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
else
REV="${REV:+r$REV}" REV="${REV:+r$REV}"
fi
;; ;;
esac esac